Revision 1360

View differences:

org.gvsig.wfs.app/trunk/org.gvsig.wfs.app/org.gvsig.wfs.app.mainplugin/src/main/assembly/gvsig-plugin-package.xml
22 22
    </fileSet>
23 23
  </fileSets>
24 24

  
25
<!--
26 25
  <dependencySets>
27 26
    <dependencySet>
28 27
      <useProjectArtifact>false</useProjectArtifact>
......
30 29
      <outputDirectory>lib</outputDirectory>
31 30
      <includes>
32 31
        <include>org.gvsig:org.gvsig.wfs.app.mainplugin</include>
32
        
33
       	<include>org.gvsig:org.gvsig.gpe.dal</include>
34
        <include>org.gvsig:org.gvsig.gpe.lib.api</include>
35
    	<include>org.gvsig:org.gvsig.gpe.lib.spi</include>
36
    	<include>org.gvsig:org.gvsig.gpe.lib.impl</include>
37
        <include>org.gvsig:org.gvsig.gpe.prov.xml</include>
38
        <include>org.gvsig:org.gvsig.gpe.prov.gml</include>
39
        <include>org.gvsig:org.gvsig.xmlpull.lib.api</include>
40
        <include>org.gvsig:org.gvsig.xmlpull.lib.spi</include>
41
        <include>org.gvsig:org.gvsig.xmlpull.lib.impl</include>
42
        <include>org.gvsig:org.gvsig.xmlpull.prov.stax</include>
43
        <include>org.gvsig:org.gvsig.xmlschema.lib.api</include>
44
        <include>org.gvsig:org.gvsig.xmlschema.lib.spi</include>
45
        <include>org.gvsig:org.gvsig.xmlschema.lib.impl</include>
46
        <include>stax:stax</include>
47

  
48
<!--        <include>org.gvsig:org.gvsig.gpe.prov.kml</include>-->
49
        <include>org.gvsig:org.gvsig.xmlpull.prov.kxml</include>
50
        <include>org.gvsig:org.gvsig.xmlschema.prov.kxml</include>
51
        
33 52
      </includes>
34 53
    </dependencySet>
35 54
  </dependencySets>
36
-->
37 55

  
38 56
</assembly>
org.gvsig.wfs.app/trunk/org.gvsig.wfs.app/org.gvsig.wfs.app.mainplugin/src/main/java/org/gvsig/fmap/dal/store/wfs/WFSLibrary.java
27 27
 
28 28
package org.gvsig.fmap.dal.store.wfs;
29 29

  
30
import org.gvsig.fmap.dal.DALFileLocator;
31 30
import org.gvsig.fmap.dal.DALLibrary;
32 31
import org.gvsig.fmap.dal.DALLocator;
32
import org.gvsig.fmap.dal.FileHelper;
33 33
import org.gvsig.fmap.dal.serverexplorer.wfs.WFSServerExplorer;
34 34
import org.gvsig.fmap.dal.serverexplorer.wfs.WFSServerExplorerFactory;
35
import org.gvsig.fmap.dal.serverexplorer.wfs.WFSServerExplorerParameters;
36 35
import org.gvsig.fmap.dal.spi.DataManagerProviderServices;
36
import org.gvsig.fmap.dal.store.gpe.GPEStoreParameters;
37
import org.gvsig.fmap.dal.store.gpe.GPEStoreProvider;
37 38
import org.gvsig.fmap.mapcontext.MapContextLibrary;
38 39
import org.gvsig.metadata.exceptions.MetadataException;
39 40
import org.gvsig.tools.ToolsLocator;
......
41 42
import org.gvsig.tools.extensionpoint.ExtensionPointManager;
42 43
import org.gvsig.tools.library.AbstractLibrary;
43 44
import org.gvsig.tools.library.LibraryException;
45
import org.gvsig.xmlpull.lib.api.XmlPullLibrary;
46
import org.gvsig.xmlschema.lib.api.XMLSchemaLibrary;
44 47

  
45 48
/**
46 49
 * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
......
51 54
    public void doRegistration() {
52 55
        registerAsServiceOf(DALLibrary.class);
53 56
        require(MapContextLibrary.class);
57
        require(XmlPullLibrary.class);
58
        require(XMLSchemaLibrary.class);
54 59
    }
55 60

  
56 61
	@Override
......
59 64

  
60 65
	@Override
61 66
	protected void doPostInitialize() throws LibraryException {
67
		GPEStoreParameters.registerParametersDefinition();
68
        try {
69
			FileHelper.registerMetadataDefinition(
70
					GPEStoreProvider.METADATA_DEFINITION_NAME,
71
					GPEStoreProvider.class, "GPEMetadata.xml");
72
		} catch (MetadataException e) {
73
			throw new LibraryException(this.getClass(), e);
74
		}
75

  
62 76
		WFSOpenStoreParameters.registerParameterClass();
63 77
		try {
64 78
			WFSStoreProvider.registerMetadataDefinition();
org.gvsig.wfs.app/trunk/org.gvsig.wfs.app/org.gvsig.wfs.app.mainplugin/src/main/java/org/gvsig/fmap/dal/store/wfs/WFSStoreProvider.java
33 33
import java.util.ArrayList;
34 34
import java.util.Iterator;
35 35
import java.util.List;
36

  
37 36
import org.cresques.cts.ICoordTrans;
38 37
import org.cresques.cts.IProjection;
39 38
import org.gvsig.fmap.crs.CRSFactory;
......
42 41
import org.gvsig.fmap.dal.DataServerExplorer;
43 42
import org.gvsig.fmap.dal.DataStoreParameters;
44 43
import org.gvsig.fmap.dal.DataTypes;
45
import org.gvsig.fmap.dal.exception.ConnectionServerException;
46 44
import org.gvsig.fmap.dal.exception.DataException;
47 45
import org.gvsig.fmap.dal.exception.InitializeException;
48 46
import org.gvsig.fmap.dal.exception.OpenException;
......
61 59
import org.gvsig.fmap.dal.serverexplorer.wfs.WFSServerExplorer;
62 60
import org.gvsig.fmap.dal.serverexplorer.wfs.WFSServerExplorerParameters;
63 61
import org.gvsig.fmap.dal.spi.DataStoreProviderServices;
62
import org.gvsig.fmap.dal.store.gpe.GPEStoreParameters;
64 63
import org.gvsig.fmap.dal.store.gpe.GPEStoreProvider;
65 64
import org.gvsig.fmap.geom.Geometry;
66 65
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
......
120 119
	 */
121 120
	private GPEStoreProvider storeProviderDelegate = null;
122 121

  
123
	private static final DataManager dataManager = DALLocator.getDataManager();
122
//	private static final DataManager dataManager = DALLocator.getDataManager();
124 123
	private static final XMLSchemaManager xmlSchemaManager = XMLSchemaLocator
125 124
			.getXMLSchemaManager();
126 125

  
......
143 142
		initParams();
144 143
		try {
145 144
			initFeatureType();
146
		} catch (WFSException e) {
145
		} catch (WFSException | ReadException e) {
147 146
			throw new InitializeException(e);
148
		} catch (ReadException e) {
149
			throw new InitializeException(e);
150 147
		}
151 148
	}
152 149

  
......
268 265
					if (ipro != null) {
269 266
						attributeDescriptor.setSRS(ipro);
270 267
					} else {
271
						if (feature.getSrs().size() > 0) {
268
						if (!feature.getSrs().isEmpty()) {
272 269
							attributeDescriptor.setSRS(CRSFactory
273 270
									.getCRS((String) feature.getSrs().get(0)));
274 271
						} else {
......
342 339
					return storeProviderDelegate.getEnvelope();
343 340
				}
344 341
			}
345
		} catch (CreateEnvelopeException e) {
342
		} catch (CreateEnvelopeException | WFSException | DataException e) {
346 343
			logger.error("Impossible to create an envelope", e);
347
		} catch (ReadException e) {
348
			logger.error("Impossible to create an envelope", e);
349
		} catch (WFSException e) {
350
			logger.error("Impossible to create an envelope", e);
351
		} catch (DataException e) {
352
			logger.error("Impossible to create an envelope", e);
353 344
		}
354 345
		return null;
355 346
	}
......
358 349
		return (WFSOpenStoreParameters) getParameters();
359 350
	}
360 351

  
361
	/*
362
	 * (non-Javadoc)
363
	 *
364
	 * @see org.gvsig.fmap.dal.store.gpe.GPEStoreProvider#open()
365
	 */
352
    @Override
366 353
	public void open() throws OpenException {
367 354
		try {
368 355
			List featureTypes = this.getFeatureStore().getFeatureTypes();
......
389 376
		}
390 377
	}
391 378

  
392
	/*
393
	 * (non-Javadoc)
394
	 *
395
	 * @see
396
	 * org.gvsig.fmap.dal.feature.spi.AbstractFeatureStoreProvider#getExplorer()
397
	 */
379
    @Override
398 380
	public DataServerExplorer getExplorer() throws ReadException {
399 381
		DataManager manager = DALLocator.getDataManager();
400 382
		WFSServerExplorerParameters params;
......
408 390
		}
409 391
	}
410 392

  
393
    @Override
411 394
	public String getProviderName() {
412 395
		return NAME;
413 396
	}
......
417 400
		return createSet(query, null);
418 401
	}
419 402

  
403
    @Override
420 404
	public FeatureSetProvider createSet(FeatureQuery query,
421 405
			FeatureType featureType) throws DataException {
422 406
		if ((featureCount == -1) || (storeProviderDelegate == null)
......
447 431

  
448 432
	private DataStoreParameters createStoreParameters(File file)
449 433
			throws InitializeException, ProviderNotRegisteredException {
450
		DataStoreParameters parameters = dataManager
451
				.createStoreParameters(GPEStoreProvider.NAME);
434
		DataStoreParameters parameters = new GPEStoreParameters();
435
//        dataManager.createStoreParameters(GPEStoreProvider.NAME);
452 436

  
453 437
		parameters.setDynValue("File", file.getAbsolutePath());
454 438
		parameters.setDynValue("Envelope", this.getDynValue("Envelope"));
......
476 460
					try {
477 461
						envelope = (Envelope) filterByAreaEnvelope.clone();
478 462
					} catch (CloneNotSupportedException e) {
463
                        logger.warn("Can't clone envelope", e);
479 464
						// Do nothing
480 465
					}
481 466
					ICoordTrans ct = envelopeCrs.getCT(CRSFactory.getCRS(crs));
......
510 495
				IProjection geometryCrs = this.getWFSParameters().getFilterByAreaCrs();
511 496

  
512 497
				if (!crs.equalsIgnoreCase(geometryCrs.getFullCode())) {
513
					Geometry geom = null;
514
					geom = (Geometry) filterByAreaGeometry.cloneGeometry();
498
					Geometry geom = (Geometry) filterByAreaGeometry.cloneGeometry();
515 499
					ICoordTrans ct = geometryCrs.getCT(CRSFactory.getCRS(crs));
516 500
					geom.reProject(ct);
517 501
					filterByAreaGeometry = geom;
......
537 521
		}
538 522
	}
539 523

  
524
    @Override
540 525
	public Object getSourceId() {
541
		StringBuffer sourceID = new StringBuffer(getWFSParameters().getUrl());
542
		sourceID.append("_" + getWFSParameters().getFeatureType());
526
		StringBuilder sourceID = new StringBuilder(getWFSParameters().getUrl());
527
		sourceID.append("_");
528
		sourceID.append(getWFSParameters().getFeatureType());
543 529
		int hash = sourceID.hashCode();
544 530
		if (sourceID.length() > 60) {
545 531
			return sourceID.substring(0, 60) + "_" + hash;
......
548 534
		}
549 535
	}
550 536

  
537
    @Override
551 538
	public Object createNewOID() {
552 539
		try {
553 540
			return String.valueOf(getFeatureCount() + 1);
......
556 543
		}
557 544
	}
558 545

  
546
    @Override
559 547
	public long getFeatureCount() throws DataException {
560 548
		if (featureCount == -1) {
561 549
			wfsStatus.setResultType(WFSStatus.RESULTYPE_HITS);
......
578 566
		return featureCount;
579 567
	}
580 568

  
569
    @Override
581 570
	public int getOIDType() {
582 571
		return DataTypes.STRING;
583 572
	}
584 573

  
574
    @Override
585 575
	public ResourceProvider getResource() {
586 576
		return storeProviderDelegate.getResource();
587 577
	}
588 578

  
579
    @Override
589 580
	protected FeatureProvider internalGetFeatureProviderByReference(
590 581
			FeatureReferenceProviderServices reference, FeatureType featureType)
591 582
			throws DataException {
......
593 584
				reference, featureType);
594 585
	}
595 586

  
587
    @Override
596 588
	public String getFullName() {
597 589
		return getWFSParameters().getUrl() + "_"
598 590
				+ getWFSParameters().getFeatureType();
599 591
	}
600 592

  
593
    @Override
601 594
	public String getName() {
602 595
		return getWFSParameters().getFeatureType();
603 596
	}
604 597

  
598
    @Override
605 599
	public boolean isKnownEnvelope() {
606 600
		return isKnownEnvelope;
607 601
	}
608 602

  
603
    @Override
609 604
	public boolean hasRetrievedFeaturesLimit() {
610 605
		return true;
611 606
	}
612 607

  
608
    @Override
613 609
	public int getRetrievedFeaturesLimit() {
614 610
		// WFS 1.0.0 can not know where is the limit
615 611
		if (getWFSParameters().getVersion().equals("1.0.0")) {
......
619 615
		}
620 616
	}
621 617

  
618
    @Override
622 619
	public void performChanges(Iterator deleteds, Iterator inserteds,
623 620
			Iterator updateds, Iterator featureTypesChanged)
624 621
			throws DataException {
......
639 636
						.addDeleteFeature(internalGetFeatureProviderByReference(
640 637
								(FeatureReferenceProviderServices) deleteds
641 638
										.next(), null).getOID().toString());
642
				;
643 639
			}
644 640
			// Add updated features
645 641
			while (updateds.hasNext()) {
646 642
				transactionBuilder.addUpdateFeature((FeatureProvider) updateds
647 643
						.next());
648 644
			}
649
		} catch (WriterHandlerCreationException e) {
645
		} catch (WriterHandlerCreationException | GeometryOperationNotSupportedException | GeometryOperationException e) {
650 646
			throw new WFSTTRansactionException(e);
651
		} catch (GeometryOperationNotSupportedException e) {
652
			throw new WFSTTRansactionException(e);
653
		} catch (GeometryOperationException e) {
654
			throw new WFSTTRansactionException(e);
655 647
		}
656 648

  
657 649
		// Send the query to the server
......
668 660
		}
669 661
	}
670 662

  
663
    @Override
671 664
	public boolean allowWrite() {
672 665
		return wfsClient.getServiceInformation().isOperationSupported(
673 666
				"Transaction");
674 667
	}
675 668

  
669
    @Override
676 670
	public Envelope getEnvelope() throws DataException {
677 671
		return (Envelope) this.getDynValue("Envelope");
678 672
	}
679 673

  
674
    @Override
680 675
	public FeatureProvider createFeatureProvider(FeatureType type)
681 676
			throws DataException {
682 677
		return super.createFeatureProvider(type);
org.gvsig.wfs.app/trunk/org.gvsig.wfs.app/org.gvsig.wfs.app.mainplugin/src/main/java/org/gvsig/wfs/gui/panels/WFSSelectFeaturePanel.java
7 7
import java.awt.Rectangle;
8 8
import java.awt.event.MouseAdapter;
9 9
import java.awt.event.MouseEvent;
10
import java.io.IOException;
11
import java.net.ConnectException;
12 10
import java.text.Collator;
11
import java.util.ArrayList;
13 12
import java.util.Collections;
14 13
import java.util.List;
15 14
import java.util.Locale;
16
import java.util.Vector;
17

  
18 15
import javax.swing.DefaultListSelectionModel;
19 16
import javax.swing.JCheckBox;
20 17
import javax.swing.JComponent;
......
36 33
import javax.swing.table.TableColumn;
37 34
import javax.swing.table.TableColumnModel;
38 35
import javax.swing.table.TableModel;
39

  
40 36
import org.gvsig.andami.PluginServices;
41 37
import org.gvsig.andami.messages.NotificationManager;
42 38
import org.gvsig.app.ApplicationLocator;
......
235 231
                 *  (non-Javadoc)
236 232
                 * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
237 233
                 */
234
                @Override
238 235
                public void mouseClicked(MouseEvent e) {
239 236
                    if (e.getClickCount() == 2) {
240 237
                        Object obj = getPanelGroup();
......
281 278
     */
282 279
    private ListSelectionListener getListSelectionListener() {
283 280
        if (listSelectionListener == null) {
284
            listSelectionListener = new ListSelectionListener() {
285
                public void valueChanged(javax.swing.event.ListSelectionEvent e) {
286
                    DefaultListSelectionModel model = (DefaultListSelectionModel) e.getSource();
287
                    LayerTableModel t_model = ((LayerTableModel) lstFeatures.getModel());
288
                    if (t_model.isUpdatingSelection()) {
281
            listSelectionListener = (javax.swing.event.ListSelectionEvent e) -> {
282
                DefaultListSelectionModel model = (DefaultListSelectionModel) e.getSource();
283
                LayerTableModel t_model = ((LayerTableModel) lstFeatures.getModel());
284
                if (t_model.isUpdatingSelection()) {
285
                    return;
286
                }
287
                // With this condition we force to execute the updating only when a row has been selected by the user
288
                if ((model.getMinSelectionIndex() > -1) && (e.getValueIsAdjusting() == false)) {
289
                    // Indicate that now we are loading a new layer
290
                    IPanelGroup panelGroup1 = getPanelGroup();
291
                    if (panelGroup1 == null) {
289 292
                        return;
290 293
                    }
291

  
292
                    // With this condition we force to execute the updating only when a row has been selected by the user
293
                    if ((model.getMinSelectionIndex() > -1) && (e.getValueIsAdjusting() == false)) {
294
                        // Indicate that now we are loading a new layer
295
                        IPanelGroup panelGroup = getPanelGroup();
296

  
297
                        if (panelGroup == null) {
298
                            return;
294
                    /*
295
                    if (((WFSParamsPanel)panelGroup).getFilterPanel() == null)
296
                    return;
297
                    */
298
                    refreshData();
299
                }
300
                // =============================================
301
                // If zero selected, settings are invalid
302
                int n_sel = getSelectedFeaturesCount();
303
                if (n_sel == 0) {
304
                    Object obj = getPanelGroup();
305
                    if (obj != null && obj instanceof WFSParamsPanel) {
306
                        obj = ((WFSParamsPanel) obj).getWizardPanel();
307
                        if (obj instanceof WFSWizard) {
308
                            ((WFSWizard) obj).callStateChanged(false);
299 309
                        }
300

  
301
                        /*
302
                         if (((WFSParamsPanel)panelGroup).getFilterPanel() == null)
303
                         return;
304
                         */
305
                        refreshData();
306 310
                    }
307

  
308
                    // =============================================
309
                    // If zero selected, settings are invalid
310
                    int n_sel = getSelectedFeaturesCount();
311
                    if (n_sel == 0) {
312
                        Object obj = getPanelGroup();
313
                        if (obj != null && obj instanceof WFSParamsPanel) {
314
                            obj = ((WFSParamsPanel) obj).getParent();
315
                            if (obj instanceof WFSWizard) {
316
                                ((WFSWizard) obj).callStateChanged(false);
317
                            }
318
                        }
319
                    }
320
                    // =============================================
321 311
                }
312
                // =============================================
322 313
            };
323 314
        }
324 315

  
......
340 331
            txtName.setToolTipText(PluginServices.getText(txtName, "feature_to_load"));
341 332

  
342 333
            txtName.getDocument().addDocumentListener(new DocumentListener() {
343
                /*
344
                 * (non-Javadoc)
345
                 * @see javax.swing.event.DocumentListener#changedUpdate(javax.swing.event.DocumentEvent)
346
                 */
334
                @Override
347 335
                public void changedUpdate(DocumentEvent e) {
348 336
                }
349 337

  
350
                /*
351
                 * (non-Javadoc)
352
                 * @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent)
353
                 */
338
                @Override
354 339
                public void insertUpdate(DocumentEvent e) {
355 340
                    IPanelGroup panelGroup = getPanelGroup();
356

  
357 341
                    if (panelGroup == null) {
358 342
                        return;
359 343
                    }
360

  
361 344
                    ((WFSParamsPanel) panelGroup).setApplicable(true);
362 345
                }
363 346

  
364
                /*
365
                 * (non-Javadoc)
366
                 * @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent)
367
                 */
347
                @Override
368 348
                public void removeUpdate(DocumentEvent e) {
369 349
                }
370 350
            });
......
383 363
            chkExtendedNames = new JCheckBox();
384 364
            chkExtendedNames.setText(PluginServices.getText(this, "show_layer_names"));
385 365
            chkExtendedNames.setBounds(10, 372, 382, 20);
386
            chkExtendedNames.addItemListener(new java.awt.event.ItemListener() {
387
                /*
388
                 * (non-Javadoc)
389
                 * @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent)
390
                 */
391
                public void itemStateChanged(java.awt.event.ItemEvent e) {
392
                    boolean b = chkExtendedNames.isSelected();
393
                    getLstFeatures().setShowLayerNames(b);
394
                    getLstFeatures().repaint();
395
                }
396
            });
366
            chkExtendedNames.addItemListener((java.awt.event.ItemEvent e) -> {
367
                boolean b = chkExtendedNames.isSelected();
368
                getLstFeatures().setShowLayerNames(b);
369
                getLstFeatures().repaint();
370
            } );
397 371
        }
398 372

  
399 373
        return chkExtendedNames;
......
423 397
    /**
424 398
     * Refresh the features list
425 399
     */
400
    @Override
426 401
    public void refresh(WFSSelectedFeature layer) {
427 402
        // Unselects all features
428 403
        unselectAllFeatures();
......
546 521
     * (non-Javadoc)
547 522
     * @see com.iver.cit.gvsig.gui.panels.AbstractWFSPanel#initialize()
548 523
     */
524
    @Override
549 525
    protected void initialize() {
550 526
        setLabel(PluginServices.getText(this, "feature"));
551 527
        setLabelGroup(PluginServices.getText(this, "wfs"));
......
579 555
     * (non-Javadoc)
580 556
     * @see com.iver.cit.gvsig.gui.panels.AbstractWFSPanel#setReference(java.lang.Object)
581 557
     */
558
    @Override
582 559
    public void setReference(Object ref) {
583 560
        super.setReference(ref);
584 561
		//		if (ref instanceof FLyrWFS){			
......
622 599
            getTableHeader().setUI(new BasicTableHeaderSelectableUI());
623 600

  
624 601
            getTableHeader().addMouseListener(new MouseAdapter() {
625
                /*
626
                 * (non-Javadoc)
627
                 * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
628
                 */
602
                @Override
629 603
                public void mouseClicked(MouseEvent e) {
630 604
                    // Sorts according the selected column
631 605
                    ((LayerTableModel) getModel()).sort(getTableHeader().getColumnModel().getColumnIndexAtX(e.getX()));
632 606
                }
633 607

  
634
                /*
635
                 * (non-Javadoc)
636
                 * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent)
637
                 */
608
                @Override
638 609
                public void mousePressed(MouseEvent e) {
639 610
                    headerSelected = getTableHeader().getColumnModel().getColumnIndexAtX(e.getX());
640 611
                    getTableHeader().repaint();
641 612
                }
642 613

  
643
                /*
644
                 * (non-Javadoc)
645
                 * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent)
646
                 */
614
                @Override
647 615
                public void mouseReleased(MouseEvent e) {
648 616
                    headerSelected = -1;
649 617
                }
......
654 622
         * (non-Javadoc)
655 623
         * @see javax.swing.JTable#createDefaultColumnsFromModel()
656 624
         */
625
        @Override
657 626
        public void createDefaultColumnsFromModel() {
658 627
            TableModel m = getModel();
659 628
            if (m != null) {
......
710 679
            LayerTableModel model = (LayerTableModel) getModel();
711 680
            model.deleteAllRows();
712 681

  
713
            for (int i = 0; i < features.length; i++) {
714
                model.addRow(features[i]);
682
            for (WFSSelectedFeature feature : features) {
683
                model.addRow(feature);
715 684
            }
685
            model.sort(0);
716 686
        }
717 687

  
718 688
        /**
......
735 705
        public class LayerTableModel extends AbstractTableModel {
736 706

  
737 707
            private static final long serialVersionUID = 2722138264867593508L;
738
            private Vector<WFSSelectedFeature> layers = new Vector<WFSSelectedFeature>();
708
//            private final Vector<WFSSelectedFeature> layers = new Vector<>();
709
            private final List<WFSSelectedFeature> layers = new ArrayList<>();
739 710
            private boolean showFeatureNameType = false;
740
            private WFSLayerStringComparator stringComparator;
711
            private final WFSLayerStringComparator stringComparator;
741 712
            private boolean updatingSelection;
742 713
            private short previousColumnSorted;
743 714

  
......
762 733
             *  (non-Javadoc)
763 734
             * @see javax.swing.table.TableModel#getRowCount()
764 735
             */
736
            @Override
765 737
            public int getRowCount() {
766 738
                return layers.size();
767 739
            }
......
770 742
             *  (non-Javadoc)
771 743
             * @see javax.swing.table.TableModel#getColumnCount()
772 744
             */
745
            @Override
773 746
            public int getColumnCount() {
774 747
                return 2;
775 748
            }
......
778 751
             *  (non-Javadoc)
779 752
             * @see javax.swing.table.TableModel#getValueAt(int, int)
780 753
             */
754
            @Override
781 755
            public Object getValueAt(int rowNumber, int columnNumber) {
782 756
                if (rowNumber < layers.size()) {
783 757
                    WFSSelectedFeature layer = (WFSSelectedFeature) layers.get(rowNumber);
......
839 813
                layers.add(layer);
840 814
                fireTableRowsInserted(getRowCount(), getRowCount());
841 815
                fireTableRowsUpdated(0, getRowCount());
816
                this.previousColumnSorted = -1;
842 817
            }
843 818

  
844 819
            /**
......
866 841
             *  (non-Javadoc)
867 842
             * @see javax.swing.table.TableModel#getColumnName(int)
868 843
             */
844
            @Override
869 845
            public String getColumnName(int columnIndex) {
870 846
                if (columnIndex == 0) {
871 847
                    return PluginServices.getText(this, "layerName");
......
977 953
             * (non-Javadoc)
978 954
             * @see javax.swing.plaf.basic.BasicTableHeaderUI#paint(java.awt.Graphics, javax.swing.JComponent)
979 955
             */
956
            @Override
980 957
            public void paint(Graphics g, JComponent c) {
981 958
                if (header.getColumnModel().getColumnCount() <= 0) {
982 959
                    return;
......
1101 1078
             * (non-Javadoc)
1102 1079
             * @see javax.swing.table.DefaultTableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int)
1103 1080
             */
1081
            @Override
1104 1082
            public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
1105 1083
                Component comp = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
1106 1084

  
......
1138 1116
            /*
1139 1117
             * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
1140 1118
             */
1119
            @Override
1141 1120
            public int compare(Object o1, Object o2) {
1142 1121
                String s1 = null, s2 = null;
1143 1122

  
org.gvsig.wfs.app/trunk/org.gvsig.wfs.app/org.gvsig.wfs.app.mainplugin/src/main/java/org/gvsig/wfs/gui/panels/WFSParamsPanel.java
2 2

  
3 3
import java.awt.Container;
4 4
import java.util.List;
5

  
6 5
import javax.swing.JTabbedPane;
7

  
6
import org.apache.commons.lang.StringUtils;
7
import org.cresques.cts.CRSUtils;
8 8
import org.cresques.cts.IProjection;
9
import org.gvsig.andami.PluginServices;
10 9
import org.gvsig.app.gui.ILayerPanel;
11 10
import org.gvsig.app.gui.WizardPanel;
12 11
import org.gvsig.fmap.crs.CRSFactory;
......
35 34
import org.gvsig.gui.beans.panelGroup.tabbedPanel.TabbedPanel;
36 35
import org.gvsig.remoteclient.wfs.filters.filterencoding.FilterEncoding;
37 36
import org.gvsig.remoteclient.wfs.schema.XMLNameSpace;
37
import org.gvsig.tools.ToolsLocator;
38 38
import org.gvsig.tools.dynobject.DynObject;
39
import org.gvsig.tools.i18n.I18nManager;
39 40
import org.gvsig.wfs.gui.panels.model.WFSSelectedFeature;
40 41
import org.gvsig.wfs.gui.panels.model.WFSSelectedFeatureManager;
41 42
import org.gvsig.wfs.gui.wizards.WFSWizard;
......
229 230
public class WFSParamsPanel extends TabbedPanel implements ILayerPanel {
230 231
	private static final long serialVersionUID = 150328995058481516L;
231 232

  
232
	private static Logger logger = LoggerFactory.getLogger(WFSParamsPanel.class);
233
	private static final Logger LOGGER = LoggerFactory.getLogger(WFSParamsPanel.class);
233 234

  
234 235
	private WFSServerExplorer serverExplorer = null;
235 236
	private WFSSelectedFeatureManager selectedFeatureManager = null;
......
253 254
	private WFSAreaPanel areaPanel = null;
254 255

  
255 256
	private String cacheSelected = null;
257
    private WizardPanel wfsWizard;
256 258

  
257 259
	/**
258 260
	 * This method initializes jTabbedPane
......
268 270
	 * (non-Javadoc)
269 271
	 * @see org.gvsig.gui.beans.panelGroup.tabbedPanel.TabbedPanel#initialize()
270 272
	 */
273
    @Override
271 274
	protected void initialize() {
272 275
		super.initialize();
273 276

  
274 277
		this.setVisible(false);
275 278
	}
279
    
280
    public WizardPanel getWizardPanel() {
281
        return this.wfsWizard;
282
    }
283
    
284
    public void setWizardPanel(WizardPanel wfsWizard) {
285
        this.wfsWizard = wfsWizard;
286
    }
276 287

  
277 288
	/**
278 289
	 * Sets the focus to the next tab of the current one.
......
298 309
	/**
299 310
	 * @see JTabbedPane#getSelectedIndex()
300 311
	 */
312
    @Override
301 313
	public int getSelectedIndex(){
302 314
		return this.getJTabbedPane().getSelectedIndex();
303 315
	}
......
305 317
	/**
306 318
	 * @see JTabbedPane#setSelectedIndex(int)
307 319
	 */
320
    @Override
308 321
	public void setSelectedIndex(int index) {
309 322
		this.getJTabbedPane().setSelectedIndex(index);
310 323
	}
......
439 452
	 * (non-Javadoc)
440 453
	 * @see org.gvsig.gui.beans.panelGroup.tabbedPanel.TabbedPanel#loadPanel(org.gvsig.gui.beans.panelGroup.panels.IPanel)
441 454
	 */
455
    @Override
442 456
	protected void loadPanel(IPanel panel) {
443 457
		super.loadPanel(panel);
444 458

  
......
582 596
	 *  (non-Javadoc)
583 597
	 * @see com.iver.cit.gvsig.gui.ILayerPanel#getLayer()
584 598
	 */
599
    @Override
585 600
	public FLayer getLayer() {
586 601
	    try {
587 602
	        FLayer layer = (FLyrVect) createLayer();
588
	        logger.warn("El flujo de la apliaci?n tal vez no deber?a haber pasado por aqu?.");
603
	        LOGGER.warn("El flujo de la apliaci?n tal vez no deber?a haber pasado por aqu?.");
589 604
	        return layer;
590 605
	    } catch (CreateLayerException e) {
591 606
	        // do nothing
......
597 612
		try {
598 613
		    FLyrVect layerAux =
599 614
		        (FLyrVect)MAP_CONTEXT_MANAGER.createLayer(getFeaturesPanel().getLayerName(), getDataStoreParameters());
600

  
601
			if((cacheSelected != null) && (!this.cacheSelected.equals(PluginServices.getText(this, "none")))){
615
            I18nManager i18n = ToolsLocator.getI18nManager();
616
            if ((StringUtils.isNotBlank(cacheSelected))
617
                && (!StringUtils.equalsIgnoreCase(cacheSelected, i18n.getTranslation("none")))) {
602 618
				layerAux.getFeatureStore().createCache(cacheSelected, getParameters(cacheSelected));
603 619
			}
604 620
			return layerAux;
605 621
		} catch (Exception e) {
606
			logger.warn("Can't create layer.",e);
622
			LOGGER.warn("Can't create layer.",e);
607 623
			throw new CreateLayerException(getFeaturesPanel().getLayerName(), e);
608 624
		}
609 625

  
......
708 724
	 * @see WFSWizard#doClickOnNextButton()
709 725
	 */
710 726
	public void doClickOnNextButton() {
711
		Object obj = this.getParent();
727
		Object obj = this.getWizardPanel();
712 728

  
713 729
		if (obj == null)
714 730
			return;
715 731

  
716 732
		// When we start to connect to a server -> the interface is the dialog WFSWizard
717 733
		if (obj instanceof WFSWizard)
718
			((WFSWizard)this.getParent()).doClickOnNextButton();
734
			((WFSWizard)this.getWizardPanel()).doClickOnNextButton();
719 735
		else {
720 736
			// When we are modifying a loaded layer -> the interface is the dialog WFSPropsDialog
721 737
			this.advanceCurrentTab();
......
749 765
	 */
750 766
	public IProjection getSelectedFeatureProjection(){
751 767
		WFSSelectedFeature selectedFeature = getSelectedFeature();
752
		if (selectedFeature.getSrs().size() > 0){
768
		if (!selectedFeature.getSrs().isEmpty()){
753 769
			String crs = (String)selectedFeature.getSrs().get(0);
754 770
			crs = getSRS(crs);
755 771
			IProjection projection = CRSFactory.getCRS(crs);
......
766 782
	 * @return
767 783
	 */
768 784
	private String getSRS(String srs){
769
		if (srs == null){
770
			return null;
771
		}
772
		if (srs.startsWith("urn:x-ogc:def:crs:")){
773
			String newString = srs.substring(srs.lastIndexOf(":") + 1, srs.length());
774
			if (srs.indexOf("EPSG") > 0){
775
				if (newString.indexOf("EPSG") < 0){
776
					newString = "EPSG:" + newString;
777
				}
778
			}
779
			return newString;
780
		}
781
		if (srs.toLowerCase().startsWith("crs:")){
782
			return srs.substring(4, srs.length());
783
		}
784
		return srs;
785
        return CRSUtils.ogcProjectionToAuthorityAndCode(srs);
785 786
	}
786 787

  
787 788
	/**
......
828 829
	 * (non-Javadoc)
829 830
	 * @see org.gvsig.gui.beans.buttonspanel.IButtonsPanel#setEnabledApplyButton(boolean)
830 831
	 */
832
    @Override
831 833
	public void setEnabledApplyButton(boolean b) {
832 834
		super.setEnabledApplyButton(b);
833 835

  
834
		Container parent = getParent();
836
		Container parent = getWizardPanel();
835 837

  
836 838
		if ((parent != null) && (parent instanceof WizardPanel))
837 839
			((WizardPanel)parent).callStateChanged(b);
......
841 843
	 * (non-Javadoc)
842 844
	 * @see org.gvsig.gui.beans.panelGroup.AbstractPanelGroup#loadPanels(org.gvsig.gui.beans.panelGroup.loaders.IPanelGroupLoader)
843 845
	 */
846
    @Override
844 847
	public void loadPanels(IPanelGroupLoader loader) throws ListCouldntAddPanelException, EmptyPanelGroupException, EmptyPanelGroupGUIException {
845 848
		// This code will be executed when is creating the dialog of properties
846 849
		if (getReference() != null) {
......
868 871
				//				setLayerName(lyr.getName());
869 872
				//				setVisible(true);
870 873
				//				refreshInfo();
871
			} catch (InitializeException e) {
872
				// TODO Auto-generated catch block
873
				e.printStackTrace();
874
			} catch (ProviderNotRegisteredException e) {
875
				// TODO Auto-generated catch block
876
				e.printStackTrace();
874
			} catch (InitializeException | ProviderNotRegisteredException e) {
875
				LOGGER.warn("Can't load panels", e);
877 876
			}
878 877
			return;
879 878
		}
org.gvsig.wfs.app/trunk/org.gvsig.wfs.app/org.gvsig.wfs.app.mainplugin/src/main/java/org/gvsig/wfs/gui/wizards/WFSWizardView.xml
1
<?xml version="1.0" encoding="UTF-8"?>
2

  
3
<object classname="com.jeta.forms.store.memento.FormPackage">
4
 <at name="fileversion">
5
  <object classname="com.jeta.forms.store.memento.FormsVersion2">
6
   <at name="major">2</at>
7
   <at name="minor">0</at>
8
   <at name="sub">0</at>
9
  </object>
10
 </at>
11
 <at name="form">
12
  <object classname="com.jeta.forms.store.memento.FormMemento">
13
   <super classname="com.jeta.forms.store.memento.ComponentMemento">
14
    <at name="cellconstraints">
15
     <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
16
      <at name="column">1</at>
17
      <at name="row">1</at>
18
      <at name="colspan">1</at>
19
      <at name="rowspan">1</at>
20
      <at name="halign">default</at>
21
      <at name="valign">default</at>
22
      <at name="insets" object="insets">0,0,0,0</at>
23
     </object>
24
    </at>
25
    <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
26
   </super>
27
   <at name="id">/home/fdiaz/projects/gvSIG/org.gvsig.wfs.app/org.gvsig.wfs.app.mainplugin/src/main/java/org/gvsig/wfs/gui/wizards/WFSWizardView.xml</at>
28
   <at name="rowspecs">FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE</at>
29
   <at name="colspecs">FILL:DEFAULT:GROW(1.0)</at>
30
   <at name="components">
31
    <object classname="java.util.LinkedList">
32
     <item >
33
      <at name="value">
34
       <object classname="com.jeta.forms.store.memento.FormMemento">
35
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
36
         <at name="cellconstraints">
37
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
38
           <at name="column">1</at>
39
           <at name="row">3</at>
40
           <at name="colspan">1</at>
41
           <at name="rowspan">1</at>
42
           <at name="halign">default</at>
43
           <at name="valign">default</at>
44
           <at name="insets" object="insets">0,0,0,0</at>
45
          </object>
46
         </at>
47
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
48
        </super>
49
        <at name="id">embedded.620857701</at>
50
        <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
51
        <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,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE</at>
52
        <at name="components">
53
         <object classname="java.util.LinkedList">
54
          <item >
55
           <at name="value">
56
            <object classname="com.jeta.forms.store.memento.BeanMemento">
57
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
58
              <at name="cellconstraints">
59
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
60
                <at name="column">2</at>
61
                <at name="row">2</at>
62
                <at name="colspan">1</at>
63
                <at name="rowspan">1</at>
64
                <at name="halign">default</at>
65
                <at name="valign">default</at>
66
                <at name="insets" object="insets">0,0,0,0</at>
67
               </object>
68
              </at>
69
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
70
             </super>
71
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
72
             <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
73
             <at name="beanproperties">
74
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
75
               <at name="classname">com.jeta.forms.components.label.JETALabel</at>
76
               <at name="properties">
77
                <object classname="com.jeta.forms.store.support.PropertyMap">
78
                 <at name="border">
79
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
80
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
81
                    <at name="name">border</at>
82
                   </super>
83
                   <at name="borders">
84
                    <object classname="java.util.LinkedList">
85
                     <item >
86
                      <at name="value">
87
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
88
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
89
                         <at name="name">border</at>
90
                        </super>
91
                       </object>
92
                      </at>
93
                     </item>
94
                    </object>
95
                   </at>
96
                  </object>
97
                 </at>
98
                 <at name="name">lblServerVersion</at>
99
                 <at name="width">92</at>
100
                 <at name="text">_Server_version</at>
101
                 <at name="fill">
102
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
103
                   <at name="name">fill</at>
104
                  </object>
105
                 </at>
106
                 <at name="height">14</at>
107
                </object>
108
               </at>
109
              </object>
110
             </at>
111
            </object>
112
           </at>
113
          </item>
114
          <item >
115
           <at name="value">
116
            <object classname="com.jeta.forms.store.memento.BeanMemento">
117
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
118
              <at name="cellconstraints">
119
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
120
                <at name="column">4</at>
121
                <at name="row">2</at>
122
                <at name="colspan">1</at>
123
                <at name="rowspan">1</at>
124
                <at name="halign">default</at>
125
                <at name="valign">default</at>
126
                <at name="insets" object="insets">0,0,0,0</at>
127
               </object>
128
              </at>
129
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
130
             </super>
131
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
132
             <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
133
             <at name="beanproperties">
134
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
135
               <at name="classname">com.jeta.forms.components.label.JETALabel</at>
136
               <at name="properties">
137
                <object classname="com.jeta.forms.store.support.PropertyMap">
138
                 <at name="border">
139
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
140
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
141
                    <at name="name">border</at>
142
                   </super>
143
                   <at name="borders">
144
                    <object classname="java.util.LinkedList">
145
                     <item >
146
                      <at name="value">
147
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
148
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
149
                         <at name="name">border</at>
150
                        </super>
151
                       </object>
152
                      </at>
153
                     </item>
154
                    </object>
155
                   </at>
156
                  </object>
157
                 </at>
158
                 <at name="name">lblServerTypeValue</at>
159
                 <at name="width">223</at>
160
                 <at name="text">-</at>
161
                 <at name="fill">
162
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
163
                   <at name="name">fill</at>
164
                  </object>
165
                 </at>
166
                 <at name="height">14</at>
167
                </object>
168
               </at>
169
              </object>
170
             </at>
171
            </object>
172
           </at>
173
          </item>
174
          <item >
175
           <at name="value">
176
            <object classname="com.jeta.forms.store.memento.BeanMemento">
177
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
178
              <at name="cellconstraints">
179
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
180
                <at name="column">12</at>
181
                <at name="row">2</at>
182
                <at name="colspan">1</at>
183
                <at name="rowspan">1</at>
184
                <at name="halign">default</at>
185
                <at name="valign">default</at>
186
                <at name="insets" object="insets">0,0,0,0</at>
187
               </object>
188
              </at>
189
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
190
             </super>
191
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
192
             <at name="beanclass">javax.swing.JButton</at>
193
             <at name="beanproperties">
194
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
195
               <at name="classname">javax.swing.JButton</at>
196
               <at name="properties">
197
                <object classname="com.jeta.forms.store.support.PropertyMap">
198
                 <at name="border">
199
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
200
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
201
                    <at name="name">border</at>
202
                   </super>
203
                   <at name="borders">
204
                    <object classname="java.util.LinkedList">
205
                     <item >
206
                      <at name="value">
207
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
208
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
209
                         <at name="name">border</at>
210
                        </super>
211
                       </object>
212
                      </at>
213
                     </item>
214
                    </object>
215
                   </at>
216
                  </object>
217
                 </at>
218
                 <at name="actionCommand">Siguiente</at>
219
                 <at name="name">btnNext</at>
220
                 <at name="width">84</at>
221
                 <at name="text">siguiente</at>
222
                 <at name="height">22</at>
223
                </object>
224
               </at>
225
              </object>
226
             </at>
227
            </object>
228
           </at>
229
          </item>
230
          <item >
231
           <at name="value">
232
            <object classname="com.jeta.forms.store.memento.BeanMemento">
233
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
234
              <at name="cellconstraints">
235
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
236
                <at name="column">10</at>
237
                <at name="row">2</at>
238
                <at name="colspan">1</at>
239
                <at name="rowspan">1</at>
240
                <at name="halign">default</at>
241
                <at name="valign">default</at>
242
                <at name="insets" object="insets">0,0,0,0</at>
243
               </object>
244
              </at>
245
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
246
             </super>
247
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
248
             <at name="beanclass">javax.swing.JButton</at>
249
             <at name="beanproperties">
250
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
251
               <at name="classname">javax.swing.JButton</at>
252
               <at name="properties">
253
                <object classname="com.jeta.forms.store.support.PropertyMap">
254
                 <at name="border">
255
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
256
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
257
                    <at name="name">border</at>
258
                   </super>
259
                   <at name="borders">
260
                    <object classname="java.util.LinkedList">
261
                     <item >
262
                      <at name="value">
263
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
264
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
265
                         <at name="name">border</at>
266
                        </super>
267
                       </object>
268
                      </at>
269
                     </item>
270
                    </object>
271
                   </at>
272
                  </object>
273
                 </at>
274
                 <at name="actionCommand">Anterior</at>
275
                 <at name="name">btnPrevious</at>
276
                 <at name="width">77</at>
277
                 <at name="text">anterior</at>
278
                 <at name="height">22</at>
279
                </object>
280
               </at>
281
              </object>
282
             </at>
283
            </object>
284
           </at>
285
          </item>
286
          <item >
287
           <at name="value">
288
            <object classname="com.jeta.forms.store.memento.BeanMemento">
289
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
290
              <at name="cellconstraints">
291
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
292
                <at name="column">6</at>
293
                <at name="row">2</at>
294
                <at name="colspan">1</at>
295
                <at name="rowspan">1</at>
296
                <at name="halign">default</at>
297
                <at name="valign">default</at>
298
                <at name="insets" object="insets">0,0,0,0</at>
299
               </object>
300
              </at>
301
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
302
             </super>
303
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
304
             <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
305
             <at name="beanproperties">
306
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
307
               <at name="classname">com.jeta.forms.components.label.JETALabel</at>
308
               <at name="properties">
309
                <object classname="com.jeta.forms.store.support.PropertyMap">
310
                 <at name="border">
311
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
312
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
313
                    <at name="name">border</at>
314
                   </super>
315
                   <at name="borders">
316
                    <object classname="java.util.LinkedList">
317
                     <item >
318
                      <at name="value">
319
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
320
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
321
                         <at name="name">border</at>
322
                        </super>
323
                       </object>
324
                      </at>
325
                     </item>
326
                    </object>
327
                   </at>
328
                  </object>
329
                 </at>
330
                 <at name="name">lblCacheFeat</at>
331
                 <at name="width">88</at>
332
                 <at name="text">_Feature_cache</at>
333
                 <at name="fill">
334
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
335
                   <at name="name">fill</at>
336
                  </object>
337
                 </at>
338
                 <at name="height">14</at>
339
                </object>
340
               </at>
341
              </object>
342
             </at>
343
            </object>
344
           </at>
345
          </item>
346
          <item >
347
           <at name="value">
348
            <object classname="com.jeta.forms.store.memento.BeanMemento">
349
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
350
              <at name="cellconstraints">
351
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
352
                <at name="column">8</at>
353
                <at name="row">2</at>
354
                <at name="colspan">1</at>
355
                <at name="rowspan">1</at>
356
                <at name="halign">default</at>
357
                <at name="valign">default</at>
358
                <at name="insets" object="insets">0,0,0,0</at>
359
               </object>
360
              </at>
361
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
362
             </super>
363
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
364
             <at name="beanclass">javax.swing.JComboBox</at>
365
             <at name="beanproperties">
366
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
367
               <at name="classname">javax.swing.JComboBox</at>
368
               <at name="properties">
369
                <object classname="com.jeta.forms.store.support.PropertyMap">
370
                 <at name="border">
371
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
372
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
373
                    <at name="name">border</at>
374
                   </super>
375
                   <at name="borders">
376
                    <object classname="java.util.LinkedList">
377
                     <item >
378
                      <at name="value">
379
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
380
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
381
                         <at name="name">border</at>
382
                        </super>
383
                       </object>
384
                      </at>
385
                     </item>
386
                    </object>
387
                   </at>
388
                  </object>
389
                 </at>
390
                 <at name="name">cmbCacheFeat</at>
391
                 <at name="width">236</at>
392
                 <at name="items">
393
                  <object classname="com.jeta.forms.store.properties.ItemsProperty">
394
                   <at name="name">items</at>
395
                  </object>
396
                 </at>
397
                 <at name="height">20</at>
398
                </object>
399
               </at>
400
              </object>
401
             </at>
402
            </object>
403
           </at>
404
          </item>
405
         </object>
406
        </at>
407
        <at name="properties">
408
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
409
          <at name="classname">com.jeta.forms.gui.form.GridView</at>
410
          <at name="properties">
411
           <object classname="com.jeta.forms.store.support.PropertyMap">
412
            <at name="border">
413
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
414
              <super classname="com.jeta.forms.store.properties.BorderProperty">
415
               <at name="name">border</at>
416
              </super>
417
              <at name="borders">
418
               <object classname="java.util.LinkedList"/>
419
              </at>
420
             </object>
421
            </at>
422
            <at name="name">pnlSiguineteAnterior</at>
423
            <at name="fill">
424
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
425
              <at name="name">fill</at>
426
             </object>
427
            </at>
428
            <at name="scollBars">
429
             <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
430
              <at name="name">scollBars</at>
431
              <at name="verticalpolicy">21</at>
432
              <at name="horizontalpolicy">31</at>
433
              <at name="border">
434
               <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
435
                <super classname="com.jeta.forms.store.properties.BorderProperty">
436
                 <at name="name">border</at>
437
                </super>
438
                <at name="borders">
439
                 <object classname="java.util.LinkedList">
440
                  <item >
441
                   <at name="value">
442
                    <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
443
                     <super classname="com.jeta.forms.store.properties.BorderProperty">
444
                      <at name="name">border</at>
445
                     </super>
446
                    </object>
447
                   </at>
448
                  </item>
449
                 </object>
450
                </at>
451
               </object>
452
              </at>
453
             </object>
454
            </at>
455
           </object>
456
          </at>
457
         </object>
458
        </at>
459
        <at name="cellpainters">
460
         <object classname="com.jeta.forms.store.support.Matrix">
461
          <at name="rows">
462
           <object classname="[Ljava.lang.Object;" size="3">
463
            <at name="item" index="0">
464
             <object classname="[Ljava.lang.Object;" size="13"/>
465
            </at>
466
            <at name="item" index="1">
467
             <object classname="[Ljava.lang.Object;" size="13"/>
468
            </at>
469
            <at name="item" index="2">
470
             <object classname="[Ljava.lang.Object;" size="13"/>
471
            </at>
472
           </object>
473
          </at>
474
         </object>
475
        </at>
476
        <at name="rowgroups">
477
         <object classname="com.jeta.forms.store.memento.FormGroupSet">
478
          <at name="groups">
479
           <object classname="java.util.HashMap"/>
480
          </at>
481
         </object>
482
        </at>
483
        <at name="colgroups">
484
         <object classname="com.jeta.forms.store.memento.FormGroupSet">
485
          <at name="groups">
486
           <object classname="java.util.HashMap"/>
487
          </at>
488
         </object>
489
        </at>
490
       </object>
491
      </at>
492
     </item>
493
     <item >
494
      <at name="value">
495
       <object classname="com.jeta.forms.store.memento.FormMemento">
496
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
497
         <at name="cellconstraints">
498
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
499
           <at name="column">1</at>
500
           <at name="row">1</at>
501
           <at name="colspan">1</at>
502
           <at name="rowspan">1</at>
503
           <at name="halign">fill</at>
504
           <at name="valign">fill</at>
505
           <at name="insets" object="insets">0,0,0,0</at>
506
          </object>
507
         </at>
508
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
509
        </super>
510
        <at name="id">embedded.N1865b1feO19052fde3a1JI7fff</at>
511
        <at name="rowspecs">CENTER:DEFAULT:GROW(1.0)</at>
512
        <at name="colspecs">FILL:DEFAULT:GROW(1.0)</at>
513
        <at name="components">
514
         <object classname="java.util.LinkedList"/>
515
        </at>
516
        <at name="properties">
517
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
518
          <at name="classname">com.jeta.forms.gui.form.GridView</at>
519
          <at name="properties">
520
           <object classname="com.jeta.forms.store.support.PropertyMap">
521
            <at name="border">
522
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
523
              <super classname="com.jeta.forms.store.properties.BorderProperty">
524
               <at name="name">border</at>
525
              </super>
526
              <at name="borders">
527
               <object classname="java.util.LinkedList"/>
528
              </at>
529
             </object>
530
            </at>
531
            <at name="name">panelPages</at>
532
            <at name="fill">
533
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
534
              <at name="name">fill</at>
535
             </object>
536
            </at>
537
            <at name="scollBars">
538
             <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
539
              <at name="name">scollBars</at>
540
              <at name="verticalpolicy">21</at>
541
              <at name="horizontalpolicy">31</at>
542
             </object>
543
            </at>
544
           </object>
545
          </at>
546
         </object>
547
        </at>
548
        <at name="cellpainters">
549
         <object classname="com.jeta.forms.store.support.Matrix">
550
          <at name="rows">
551
           <object classname="[Ljava.lang.Object;" size="1">
552
            <at name="item" index="0">
553
             <object classname="[Ljava.lang.Object;" size="1"/>
554
            </at>
555
           </object>
556
          </at>
557
         </object>
558
        </at>
559
        <at name="rowgroups">
560
         <object classname="com.jeta.forms.store.memento.FormGroupSet">
561
          <at name="groups">
562
           <object classname="java.util.HashMap"/>
563
          </at>
564
         </object>
565
        </at>
566
        <at name="colgroups">
567
         <object classname="com.jeta.forms.store.memento.FormGroupSet">
568
          <at name="groups">
569
           <object classname="java.util.HashMap"/>
570
          </at>
571
         </object>
572
        </at>
573
       </object>
574
      </at>
575
     </item>
576
    </object>
577
   </at>
578
   <at name="properties">
579
    <object classname="com.jeta.forms.store.memento.PropertiesMemento">
580
     <at name="classname">com.jeta.forms.gui.form.GridView</at>
581
     <at name="properties">
582
      <object classname="com.jeta.forms.store.support.PropertyMap">
583
       <at name="border">
584
        <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
585
         <super classname="com.jeta.forms.store.properties.BorderProperty">
586
          <at name="name">border</at>
587
         </super>
588
         <at name="borders">
589
          <object classname="java.util.LinkedList"/>
590
         </at>
591
        </object>
592
       </at>
593
       <at name="name">panelMain</at>
594
       <at name="fill">
595
        <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
596
         <at name="name">fill</at>
597
        </object>
598
       </at>
599
       <at name="scollBars">
600
        <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff