Revision 2317 org.gvsig.raster.wms/branches/org.gvsig.raster.wms_dataaccess_refactoring/org.gvsig.raster.wms.app.wmsclient/src/main/java/org/gvsig/raster/wms/app/wmsclient/gui/panel/WMSParamsPanel.java

View differences:

WMSParamsPanel.java
29 29
import java.awt.event.FocusListener;
30 30
import java.awt.event.MouseAdapter;
31 31
import java.awt.event.MouseEvent;
32
import java.awt.geom.Rectangle2D;
33 32
import java.lang.reflect.InvocationTargetException;
34 33
import java.util.AbstractCollection;
35 34
import java.util.ArrayList;
......
48 47
import javax.swing.JTextField;
49 48
import javax.swing.tree.TreePath;
50 49

  
51
import org.cresques.cts.ICoordTrans;
52
import org.cresques.cts.IProjection;
53 50
import org.gvsig.andami.IconThemeHelper;
54 51
import org.gvsig.andami.PluginServices;
55 52
import org.gvsig.andami.messages.NotificationManager;
56 53
import org.gvsig.app.gui.WizardPanel;
57 54
import org.gvsig.app.gui.wizards.FormatListModel;
58 55
import org.gvsig.app.gui.wizards.WizardListenerSupport;
59
import org.gvsig.fmap.crs.CRSFactory;
60 56
import org.gvsig.fmap.dal.DALLocator;
61 57
import org.gvsig.fmap.dal.DataManager;
62 58
import org.gvsig.fmap.dal.DataParameters;
......
66 62
import org.gvsig.fmap.dal.exception.InitializeException;
67 63
import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
68 64
import org.gvsig.fmap.mapcontext.exceptions.LoadLayerException;
69
import org.gvsig.fmap.mapcontext.exceptions.ProjectionLayerException;
70 65
import org.gvsig.fmap.mapcontext.layers.FLayer;
71 66
import org.gvsig.fmap.mapcontext.layers.FLayers;
72
import org.gvsig.gui.beans.Messages;
73 67
import org.gvsig.gui.beans.controls.dnd.JDnDListModel;
74 68
import org.gvsig.gui.beans.listeners.BeanListener;
75 69
import org.gvsig.raster.wms.app.wmsclient.gui.wizard.LayerTreeModel;
......
876 870
	 * Refreshes the SRS list
877 871
	 */
878 872
	private void refreshSRS() {
879
		ArrayList elements = ((JDnDListModel) lstSelectedLayers.getModel())
880
				.getElements();
881
		WMSLayerNode[] layers = (WMSLayerNode[]) elements
882
				.toArray(new WMSLayerNode[0]);
873
		ArrayList<?> elements = ((JDnDListModel) lstSelectedLayers.getModel()).getElements();
874
		WMSLayerNode[] layers = (WMSLayerNode[]) elements.toArray(new WMSLayerNode[0]);
883 875

  
884 876
		SRSListModel model = new SRSListModel();
885 877

  
......
945 937
	}
946 938

  
947 939
	public String getLayersQuery() {
948
		ArrayList elements = ((JDnDListModel) getLstSelectedLayers().getModel())
949
				.getElements();
950
		WMSLayerNode[] layers = (WMSLayerNode[]) elements
951
				.toArray(new WMSLayerNode[0]);
940
		ArrayList<?> elements = ((JDnDListModel) getLstSelectedLayers().getModel()).getElements();
941
		WMSLayerNode[] layers = (WMSLayerNode[]) elements.toArray(new WMSLayerNode[0]);
952 942

  
953 943
		// Nombre separado por comas de las capas
954 944
		String layersQuery = layers[layers.length - 1].getName();
......
983 973
		getJTxtNomCapa().setText(name);
984 974
	}
985 975

  
986
	public Rectangle2D getLayersRectangle() throws ProjectionLayerException {
987
		ArrayList elements = ((JDnDListModel) getLstSelectedLayers().getModel())
988
				.getElements();
989
		WMSLayerNode[] layers = (WMSLayerNode[]) elements
990
				.toArray(new WMSLayerNode[0]);
976
	/*
977
	 * Comento est? metodo pq el extent completo debe proporcionarlo el provider. Eliminar
978
	 * por completo en futuras versiones si todo funciona bien 16/12/2013
979
	 * public Rectangle2D getLayersRectangle() throws ProjectionLayerException {
980
		ArrayList<?> elements = ((JDnDListModel) getLstSelectedLayers().getModel()).getElements();
981
		WMSLayerNode[] layers = (WMSLayerNode[]) elements.toArray(new WMSLayerNode[0]);
991 982
		String[] layerNames = new String[layers.length];
992 983
		for (int i = 0; i < layerNames.length; i++) {
993 984
			layerNames[i] = layers[i].getName();
994 985
		}
995 986
		return explorer.getBoundingBox(layerNames, getSRS());
996
	}
987
	}*/
997 988

  
998 989
	public TreePath[] getSelectedLayers() {
999 990
		return getTreeLayers().getSelectionPaths();
......
1009 1000
	 * @return
1010 1001
	 */
1011 1002
	public String getQueryableLayerQuery() {
1012
		ArrayList elements = ((JDnDListModel) getLstSelectedLayers().getModel())
1013
				.getElements();
1014
		WMSLayerNode[] layers = (WMSLayerNode[]) elements
1015
				.toArray(new WMSLayerNode[0]);
1003
		ArrayList<?> elements = ((JDnDListModel) getLstSelectedLayers().getModel()).getElements();
1004
		WMSLayerNode[] layers = (WMSLayerNode[]) elements.toArray(new WMSLayerNode[0]);
1016 1005
		// Nombre separado por comas de las capas
1017 1006
		String layersQuery = "";
1018 1007
		int i;
......
1432 1421
			}
1433 1422
			return l;
1434 1423
		} else {
1435
			DataStoreParameters parameters = explorer.getStoreParameters();
1424
			DataStoreParameters parameters = explorer.getStoredParameters();
1436 1425
			WMSDataParameters par = null;
1437 1426
			if(parameters instanceof WMSDataParameters) {
1438 1427
				par = (WMSDataParameters) parameters;
......
1461 1450
			try {
1462 1451
				layer.setParameters(parameters);
1463 1452
				layer.setExplorer(explorer);
1464
				layer.setFullExtent(getLayersRectangle());
1453
				//layer.setFullExtent(getLayersRectangle());
1465 1454
			} catch (InitializeException e) {
1466 1455
				throw new LoadLayerException("Error initializating layer", e);
1467 1456
			}
......
1551 1540
		} else {
1552 1541
			if (nodeSelected(selection, node)) {
1553 1542
				
1554
				DataStoreParameters parameters = explorer.getStoreParameters();
1543
				DataStoreParameters parameters = explorer.getStoredParameters();
1555 1544
				WMSDataParameters par = null;
1556 1545
				if(parameters instanceof WMSDataParameters) {
1557 1546
					par = (WMSDataParameters) parameters;
......
1577 1566
				par.deleteCache(updating);
1578 1567
				
1579 1568
				FLyrWMS layer = new FLyrWMS();
1580
				try {
1581
					layer.setParameters(parameters);
1582
					layer.setExplorer(explorer);
1569
				layer.setParameters(parameters);
1570
				layer.setExplorer(explorer);
1571
				
1572
				/*try {
1583 1573
					layer.setFullExtent(getLayersRectangle());
1584 1574
				} catch (InitializeException e) {
1585 1575
					if (e.getCause() instanceof InvocationTargetException) {
......
1595 1585
					return null;
1596 1586
				} catch (ProjectionLayerException e) {
1597 1587
					throw new InitializeException(e);
1598
				}
1588
				}*/
1599 1589
				return layer;
1600 1590

  
1601 1591
			} else {
......
1611 1601
	 * @return
1612 1602
	 */
1613 1603
	protected FLayer getLayerPlain(boolean cached) throws InitializeException {
1614
		WMSDataParameters par = (WMSDataParameters)explorer.getStoreParameters();
1604
		WMSDataParameters par = (WMSDataParameters)explorer.getStoredParameters();
1615 1605
		DataStoreParameters parameters = par;
1616 1606
		
1617 1607
		if(cached) {
......
1642 1632
		par.deleteCache(updating);
1643 1633
		
1644 1634
		FLyrWMS layer = new FLyrWMS();
1645
		try {
1646
			layer.setParameters(parameters);
1647
			layer.setExplorer(explorer);
1635
		layer.setParameters(parameters);
1636
		layer.setExplorer(explorer);
1637
		layer.setName(getLayerName());
1638
		
1639
		/*try {
1648 1640
			layer.setFullExtent(getLayersRectangle());
1649
			layer.setName(getLayerName());
1650 1641
		} catch (InitializeException e) {
1651 1642
			String msg = getDriverExceptionMessage(e);
1652 1643
			if(msg != null) {
......
1656 1647
				throw e;
1657 1648
		} catch (ProjectionLayerException e) {
1658 1649
			throw new InitializeException(e);
1659
		}
1650
		}*/
1660 1651
		return layer;
1661 1652
	}
1662 1653

  

Also available in: Unified diff