Revision 32545

View differences:

branches/v2_0_0_prep/extensions/org.gvsig.arcims.feature.extension/src/main/java/org/gvsig/arcims/feature/gui/wizards/ArcImsFeatureWizard.java
44 44

  
45 45
import java.awt.BorderLayout;
46 46
import java.awt.geom.Rectangle2D;
47
import java.util.List;
48 47

  
49 48
import javax.swing.JPanel;
50 49
import javax.swing.JScrollPane;
......
60 59
import org.gvsig.arcims.feature.gui.panels.FeatureServicePanel;
61 60
import org.gvsig.arcims.feature.gui.panels.ServiceNamesPanel;
62 61
import org.gvsig.arcims.feature.gui.panels.utils.LayersListElement;
62
import org.gvsig.fmap.crs.CRSFactory;
63 63
import org.gvsig.fmap.dal.DALLocator;
64 64
import org.gvsig.fmap.dal.DataManager;
65 65
import org.gvsig.fmap.dal.DataStoreParameters;
......
78 78
import org.gvsig.remoteclient.arcims.ArcImsClient;
79 79
import org.gvsig.remoteclient.arcims.ArcImsFeatureClient;
80 80
import org.gvsig.remoteclient.arcims.ArcImsStatus;
81
import org.gvsig.remoteclient.arcims.ArcImsVectStatus;
82
import org.gvsig.remoteclient.arcims.utils.ArcImsFeature;
83 81
import org.gvsig.remoteclient.arcims.utils.ServiceInfoTags;
84 82
import org.gvsig.remoteclient.arcims.utils.ServiceInformation;
85 83
import org.gvsig.remoteclient.arcims.utils.ServiceInformationLayerFeatures;
......
179 177
		ArcImsStatus status = this.getServerExplorer().getStatus();
180 178
		// view envelope
181 179
		IWindow win = PluginServices.getMDIManager().getActiveWindow();
182
		ViewPort vport = ((DefaultViewPanel) win).getMapControl().getMapContext().getViewPort();
180
		ViewPort vport = ((DefaultViewPanel) win).getMapControl()
181
				.getMapContext().getViewPort();
183 182
		Envelope2D enve = (Envelope2D) vport.getEnvelope();
184
		if(enve == null){
183
		if (enve == null) {
185 184
			Rectangle2D r = status.getServiceInfo().getEnvelopeR2D();
186
			
187
			enve = new Envelope2D(r.getMinX(),r.getMinY(),r.getMinY(),r.getMaxY());
185

  
186
			enve = new Envelope2D(r.getMinX(), r.getMinY(), r.getMinY(), r
187
					.getMaxY());
188 188
		}
189 189
		status.setEnvelope(enve);
190

  
190 191
		// status srs
191
		IProjection proj = ((DefaultViewPanel) win).getMapControl().getMapContext().getProjection();
192
		status.setSrs(proj.getAbrev());	
193
		ArcImsFeatureClient client = ((ArcImsFeatureClient)this.serverExplorer.getClient());
192
		IProjection proj = ((DefaultViewPanel) win).getMapControl()
193
				.getMapContext().getProjection();
194
		status.setSrs(proj.getAbrev());
195
		ArcImsFeatureClient client = ((ArcImsFeatureClient) this.serverExplorer
196
				.getClient());
194 197
		try {
195
			List<List<ArcImsFeature>> featuresLayers = client.getMap((ArcImsVectStatus)status);
196
		
197
//			DataStoreProviderServices
198
//			params.setDefaultFeatureType(this.createFeatureType(params, layerId, status));
199
			FLayer layer = this.getLayer();
198

  
199
			ArcImsStoreParameters parameters = this.getStoreParameters();
200

  
201
			FLayer layer = LayerFactory.getInstance().createLayer(
202
					status.getNewLayerName(), parameters);
203

  
200 204
			this.getMapCtrl().getMapContext().getLayers().addLayer(layer);
201 205
		} catch (Exception e) {
202 206
			logger.error("Error creating ArcIms layer", e);
......
211 215
	 * @return the new ArcIMS layer to be added to the project
212 216
	 * @throws ProviderNotRegisteredException
213 217
	 * @throws InitializeException
218
	 * @throws ProviderNotRegisteredException
219
	 * @throws InitializeException
214 220
	 * @throws LoadLayerException
215 221
	 */
216
	public FLayer getLayer() throws InitializeException,
217
			ProviderNotRegisteredException, LoadLayerException {
222
	private ArcImsStoreParameters getStoreParameters()
223
			throws InitializeException, ProviderNotRegisteredException {
218 224

  
219 225
		DataManager dataManager = DALLocator.getDataManager();
220 226
		ArcImsStoreParameters parameters = (ArcImsStoreParameters) dataManager
221 227
				.createStoreParameters(ArcImsStoreProvider.NAME);
222 228

  
223
		parameters.setUrl((String) serverExplorer.getParameters().getDynValue(
224
				"url"));
225
		parameters.setVersion((String) serverExplorer.getParameters()
229
		parameters.setServerUrl((String) serverExplorer.getParameters()
230
				.getDynValue("url"));
231
		parameters.setServerVersion((String) serverExplorer.getParameters()
226 232
				.getDynValue("version"));
227
		parameters.setNameService(this.serverExplorer.getStatus()
233
		parameters.setServiceName(this.serverExplorer.getStatus()
228 234
				.getServiceName());
229
		parameters.setTypeService(this.serverExplorer.getStatus()
235
		parameters.setServiceType(this.serverExplorer.getStatus()
230 236
				.getServiceType());
231
		parameters.setLayersSelected(this.serverExplorer.getStatus()
232
				.getLayerQueryString());
233

  
234
		// create layer
235

  
236
		this.theLayer = null;
237
		this.theLayer = LayerFactory.getInstance().createLayer(
238
				this.serverExplorer.getStatus().getNewLayerName(), parameters);
239

  
240
		return theLayer;
237
		parameters.setSelectedLayers(this.serverExplorer.getStatus()
238
				.getLayersIdsSelected());
239
		parameters.setServiceInfo(this.serverExplorer.getStatus()
240
				.getServiceInfo());
241
		parameters.setGroupLayers(feaServicePanel.isGroupOptionSelected());
242
		parameters.setSRS(CRSFactory.getCRS(this.serverExplorer.getStatus()
243
				.getSrs()));
244
		parameters.setEnvelope(this.serverExplorer.getStatus().getEnvelope());
245
		return parameters;
241 246
	}
242 247

  
243 248
	/**
......
430 435
	public void initWizard() {
431 436
		// nothing to do
432 437
	}
433
	
438

  
434 439
	/**
435 440
	 * 
436 441
	 * @param url
437 442
	 * @param version
438
	 * @throws ProviderNotRegisteredException 
439
	 * @throws InitializeException 
440
	 * @throws ValidateDataParametersException 
443
	 * @throws ProviderNotRegisteredException
444
	 * @throws InitializeException
445
	 * @throws ValidateDataParametersException
441 446
	 */
442
	public void createServerExplorer(String url, String version) throws ValidateDataParametersException, InitializeException, ProviderNotRegisteredException{
447
	public void createServerExplorer(String url, String version)
448
			throws ValidateDataParametersException, InitializeException,
449
			ProviderNotRegisteredException {
443 450
		DataManager dataManager = DALLocator.getDataManager();
444 451
		// Create the server explorer parameters
445 452
		ArcImsServerExplorerParameters parameters = (ArcImsServerExplorerParameters) dataManager
......
450 457
		// Create the server explorer
451 458
		serverExplorer = (ArcImsServerExplorer) dataManager
452 459
				.createServerExplorer(parameters);
453
		
454
	}		
455
		
456 460

  
461
	}
462

  
457 463
}

Also available in: Unified diff