Revision 22932 branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/TableOperations.java

View differences:

TableOperations.java
120 120
							PluginServices.getMDIManager().closeWindow(wiz);
121 121

  
122 122
							ProjectTable sourceProjectTable = (ProjectTable) sourceTable.getSelected();
123
							FeatureStore fs1 = sourceProjectTable.getModelo();
123
							FeatureStore fs1 = sourceProjectTable.getModel();
124 124
							String tableName1 = fs1.getName();
125 125

  
126 126
							ProjectTable targetProjectTable = (ProjectTable) targetTable.getSelected();
127
							FeatureStore fs2 = targetProjectTable.getModelo();
127
							FeatureStore fs2 = targetProjectTable.getModel();
128 128

  
129 129
							String tableName2 = fs2.getName();
130 130

  
......
150 150
								JoinFeatureStore jfs=(JoinFeatureStore)dm.createDataStore(jfsp);
151 151
								featureStore=jfs;
152 152
								ProjectTable projectTable = (ProjectTable) sourceTable.getSelected();
153
								FeatureStore original = projectTable.getModel();
153 154
								projectTable.setModel(jfs);
155

  
156
								original.dispose();
157

  
154 158
								IWindow[] windows=PluginServices.getMDIManager().getAllWindows();
155 159
								Table tableWindow;
156 160
								for (int i = 0; i < windows.length; i++) {
......
178 182

  
179 183
								try {
180 184
									firstTableField.setModel(new FieldSelectionModel(
181
											pt.getModelo(),
185
											pt.getModel(),
182 186
											PluginServices.getText(this, "seleccione_campo_enlace"),
183 187
											null));
184 188
								} catch (SelectionException e) {
......
191 195
									ProjectTable pt = (ProjectTable) sourceTable.getSelected();
192 196

  
193 197
									//?ndice del campo
194
									FeatureStore fs = pt.getModelo();
198
									FeatureStore fs = pt.getModel();
195 199
									String fieldName = (String) firstTableField.getSelected();
196 200
									String type = fs.getDefaultFeatureType().get(fieldName).getDataType();
197 201

  
198 202

  
199 203
									secondTableField.setModel(new FieldSelectionModel(
200
											((ProjectTable) targetTable.getSelected()).getModelo(),
204
											((ProjectTable) targetTable
205
														.getSelected())
206
														.getModel(),
201 207
											PluginServices.getText(this, "seleccione_campo_enlace"),
202 208
											type));
203 209
								} catch (SelectionException e) {
......
246 252
							PluginServices.getMDIManager().closeWindow(wiz);
247 253

  
248 254
							ProjectTable sourceProjectTable = (ProjectTable) sourceTable.getSelected();
249
							FeatureStore sds1 = sourceProjectTable.getModelo();
255
							FeatureStore sds1 = sourceProjectTable.getModel();
250 256

  
251 257
							ProjectTable targetProjectTable = (ProjectTable) targetTable.getSelected();
252
							FeatureStore sds2 = targetProjectTable.getModelo();
258
							FeatureStore sds2 = targetProjectTable.getModel();
253 259

  
254 260
							String field1 = (String) firstTableField.getSelected();
255 261
							String field2 = (String) secondTableField.getSelected();
......
268 274

  
269 275
								try {
270 276
									firstTableField.setModel(new FieldSelectionModel(
271
											pt.getModelo(),
277
											pt.getModel(),
272 278
											PluginServices.getText(this, "seleccione_campo_enlace"),
273 279
											null));
274 280
								} catch (SelectionException e) {
......
281 287
									ProjectTable pt = (ProjectTable) sourceTable.getSelected();
282 288

  
283 289
									//?ndice del campo
284
									FeatureStore fs = pt.getModelo();
290
									FeatureStore fs = pt.getModel();
285 291
									String fieldName = (String) firstTableField.getSelected();
286 292
									String type = fs.getDefaultFeatureType().get(fieldName).getDataType();
287 293

  
288 294
									secondTableField.setModel(new FieldSelectionModel(
289
											((ProjectTable) targetTable.getSelected()).getModelo(),
295
											((ProjectTable) targetTable
296
														.getSelected())
297
														.getModel(),
290 298
											PluginServices.getText(this, "seleccione_campo_enlace"),
291 299
											type));
292 300
								} catch (SelectionException e) {

Also available in: Unified diff