Revision 7020
trunk/libraries/libJCRS/.classpath | ||
---|---|---|
3 | 3 |
<classpathentry kind="src" path="src"/> |
4 | 4 |
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> |
5 | 5 |
<classpathentry combineaccessrules="false" kind="src" path="/libCq CMS for java"/> |
6 |
<classpathentry kind="src" path="/appgvSIG"/> |
|
6 |
<classpathentry combineaccessrules="false" kind="src" path="/_fwAndami"/> |
|
7 |
<classpathentry combineaccessrules="false" kind="src" path="/appgvSIG"/> |
|
7 | 8 |
<classpathentry sourcepath="/libFMap" kind="lib" path="libFmap.jar"/> |
8 |
<classpathentry kind="src" path="/_fwAndami"/> |
|
9 | 9 |
<classpathentry kind="output" path="bin"/> |
10 | 10 |
</classpath> |
trunk/libraries/libJCRS/src/org/gvsig/crs/ui/CrsView.java | ||
---|---|---|
9 | 9 |
|
10 | 10 |
import javax.swing.BorderFactory; |
11 | 11 |
import javax.swing.JButton; |
12 |
import javax.swing.JCheckBox; |
|
13 | 12 |
import javax.swing.JPanel; |
14 | 13 |
import javax.swing.JRadioButton; |
15 | 14 |
import javax.swing.ListSelectionModel; |
... | ... | |
22 | 21 |
import org.gvsig.crs.Query; |
23 | 22 |
|
24 | 23 |
import com.iver.andami.PluginServices; |
25 |
import com.iver.andami.ui.mdiManager.View;
|
|
26 |
import com.iver.andami.ui.mdiManager.ViewInfo;
|
|
24 |
import com.iver.andami.ui.mdiManager.IWindow;
|
|
25 |
import com.iver.andami.ui.mdiManager.WindowInfo;
|
|
27 | 26 |
import com.iver.cit.gvsig.gui.panels.ProjChooserPanel; |
28 | 27 |
import com.iver.cit.gvsig.gui.panels.ProjChooserPanelTransformation; |
29 | 28 |
|
30 |
public class CrsView extends JPanel implements View, ListSelectionListener{
|
|
29 |
public class CrsView extends JPanel implements IWindow, ListSelectionListener{
|
|
31 | 30 |
|
32 | 31 |
private static final long serialVersionUID = 1L; |
33 | 32 |
|
... | ... | |
236 | 235 |
} |
237 | 236 |
|
238 | 237 |
private void accept_actionPerformed(ActionEvent e) { |
239 |
PluginServices.getMDIManager().closeView(this);
|
|
238 |
PluginServices.getMDIManager().closeWindow(this);
|
|
240 | 239 |
} |
241 | 240 |
|
242 | 241 |
|
... | ... | |
257 | 256 |
|
258 | 257 |
private void next_actionPerformed(ActionEvent e) { |
259 | 258 |
if(epsgTrans.isSelected() == true && contentPane.getCodeCRS() != -1){ |
260 |
//PluginServices.getMDIManager().closeView(this);
|
|
259 |
//PluginServices.getMDIManager().closeWindow(this);
|
|
261 | 260 |
TransformationEpsgPanel tr = new TransformationEpsgPanel(contentPane.getWKT(),contentPane.getCodeCRS(), |
262 | 261 |
crs_target); |
263 | 262 |
tr.setSize(new Dimension(550, 400)); |
264 | 263 |
tr.setLayout(new GridLayout(2,2)); |
265 | 264 |
tr.setLayout(new FlowLayout(FlowLayout.LEFT,5,20)); |
266 |
PluginServices.getMDIManager().addView(tr);
|
|
265 |
PluginServices.getMDIManager().addWindow(tr);
|
|
267 | 266 |
setProjection(tr.getProjection()); |
268 | 267 |
|
269 | 268 |
}else if(nadgrids.isSelected() == true && contentPane.getCodeCRS() != -1) { |
270 |
//PluginServices.getMDIManager().closeView(this);
|
|
269 |
//PluginServices.getMDIManager().closeWindow(this);
|
|
271 | 270 |
TransformationNadgridsPanel tn = new TransformationNadgridsPanel(contentPane.getWKT(),contentPane.getCodeCRS()); |
272 | 271 |
tn.setSize(new Dimension(550, 275)); |
273 | 272 |
tn.setLayout(new GridLayout(2,2)); |
274 | 273 |
tn.setLayout(new FlowLayout(FlowLayout.LEFT,5,10)); |
275 |
PluginServices.getMDIManager().addView(tn);
|
|
274 |
PluginServices.getMDIManager().addWindow(tn);
|
|
276 | 275 |
setProjection(tn.getProjection()); |
277 | 276 |
}else if(manualTrans.isSelected() == true && contentPane.getCodeCRS() != -1) { |
278 |
//PluginServices.getMDIManager().closeView(this);
|
|
277 |
//PluginServices.getMDIManager().closeWindow(this);
|
|
279 | 278 |
TransformationManualPanel tm = new TransformationManualPanel(contentPane.getWKT(),contentPane.getCodeCRS()); |
280 | 279 |
tm.setSize(new Dimension(550, 400)); |
281 | 280 |
tm.setLayout(new GridLayout(2,2)); |
282 | 281 |
tm.setLayout(new FlowLayout(FlowLayout.LEFT,5,10)); |
283 |
PluginServices.getMDIManager().addView(tm);
|
|
282 |
PluginServices.getMDIManager().addWindow(tm);
|
|
284 | 283 |
}/*else if(withOutTrans.isSelected() == true && contentPane.getCodeCRS() != -1) { |
285 |
PluginServices.getMDIManager().closeView(this);
|
|
284 |
PluginServices.getMDIManager().closeWindow(this);
|
|
286 | 285 |
WithoutTranformation wt = new WithoutTranformation(contentPane.getWKT(),contentPane.getCodeCRS()); |
287 | 286 |
wt.setSize(new Dimension(550, 200)); |
288 | 287 |
wt.setLayout(new GridLayout(2,2)); |
289 | 288 |
wt.setLayout(new FlowLayout(FlowLayout.LEFT,5,10)); |
290 |
PluginServices.getMDIManager().addView(wt);
|
|
289 |
PluginServices.getMDIManager().addWindow(wt);
|
|
291 | 290 |
}*/ |
292 | 291 |
} |
293 | 292 |
|
... | ... | |
308 | 307 |
} |
309 | 308 |
|
310 | 309 |
private void cancel_actionPerformed(ActionEvent e) { |
311 |
PluginServices.getMDIManager().closeView(this);
|
|
310 |
PluginServices.getMDIManager().closeWindow(this);
|
|
312 | 311 |
} |
313 | 312 |
|
314 | 313 |
public ICrs getProjection() { |
... | ... | |
318 | 317 |
public void setProjection(IProjection proj) { |
319 | 318 |
crsfirst = proj; |
320 | 319 |
} |
321 |
|
|
322 |
public ViewInfo getViewInfo() { |
|
323 |
ViewInfo m_viewinfo=new ViewInfo(ViewInfo.MODALDIALOG); |
|
324 |
m_viewinfo.setTitle(PluginServices.getText(this,"CrsView")); |
|
325 |
return m_viewinfo; |
|
326 |
} |
|
327 |
|
|
320 |
|
|
328 | 321 |
public void valueChanged(ListSelectionEvent e) { |
329 | 322 |
ListSelectionModel lsm = (ListSelectionModel)e.getSource(); |
330 | 323 |
if (lsm.isSelectionEmpty()) { |
... | ... | |
406 | 399 |
|
407 | 400 |
|
408 | 401 |
} |
402 |
public WindowInfo getWindowInfo() { |
|
403 |
WindowInfo m_viewinfo=new WindowInfo(WindowInfo.MODALDIALOG); |
|
404 |
m_viewinfo.setTitle(PluginServices.getText(this,"CrsView")); |
|
405 |
return m_viewinfo; |
|
406 |
} |
|
409 | 407 |
} |
trunk/libraries/libJCRS/src/org/gvsig/crs/ui/TransformationNadgridsPanel.java | ||
---|---|---|
22 | 22 |
import org.gvsig.crs.ICrs; |
23 | 23 |
|
24 | 24 |
import com.iver.andami.PluginServices; |
25 |
import com.iver.andami.ui.mdiManager.View;
|
|
26 |
import com.iver.andami.ui.mdiManager.ViewInfo;
|
|
25 |
import com.iver.andami.ui.mdiManager.IWindow;
|
|
26 |
import com.iver.andami.ui.mdiManager.WindowInfo;
|
|
27 | 27 |
import com.iver.cit.gvsig.gui.panels.ProjChooserPanelTransformation; |
28 | 28 |
|
29 |
public class TransformationNadgridsPanel extends DefaultDialogPanel implements View {
|
|
29 |
public class TransformationNadgridsPanel extends DefaultDialogPanel implements IWindow {
|
|
30 | 30 |
|
31 | 31 |
private static final long serialVersionUID = 1L; |
32 | 32 |
|
... | ... | |
148 | 148 |
} |
149 | 149 |
|
150 | 150 |
public void cancelButton_actionPerformed(ActionEvent e) { |
151 |
PluginServices.getMDIManager().closeView(this);
|
|
151 |
PluginServices.getMDIManager().closeWindow(this);
|
|
152 | 152 |
} |
153 | 153 |
|
154 | 154 |
private JButton getButtonAccept() { |
... | ... | |
168 | 168 |
} |
169 | 169 |
|
170 | 170 |
public void acceptButton_actionPerformed(ActionEvent e) { |
171 |
PluginServices.getMDIManager().closeView(this);
|
|
171 |
PluginServices.getMDIManager().closeWindow(this);
|
|
172 | 172 |
} |
173 | 173 |
|
174 | 174 |
private JPanel getOpenPanel() { |
... | ... | |
251 | 251 |
firstProj = proj; |
252 | 252 |
} |
253 | 253 |
|
254 |
|
|
255 |
public ViewInfo getViewInfo() { |
|
256 |
ViewInfo m_viewinfo=new ViewInfo(ViewInfo.MODALDIALOG); |
|
254 |
public WindowInfo getWindowInfo() { |
|
255 |
WindowInfo m_viewinfo=new WindowInfo(WindowInfo.MODALDIALOG); |
|
257 | 256 |
m_viewinfo.setTitle(PluginServices.getText(this,"Nadgrids")); |
258 | 257 |
return m_viewinfo; |
259 | 258 |
} |
trunk/libraries/libJCRS/src/org/gvsig/crs/ui/InfoCrs.java | ||
---|---|---|
18 | 18 |
import org.gvsig.crs.ICrs; |
19 | 19 |
|
20 | 20 |
import com.iver.andami.PluginServices; |
21 |
import com.iver.andami.ui.mdiManager.View;
|
|
22 |
import com.iver.andami.ui.mdiManager.ViewInfo;
|
|
21 |
import com.iver.andami.ui.mdiManager.IWindow;
|
|
22 |
import com.iver.andami.ui.mdiManager.WindowInfo;
|
|
23 | 23 |
|
24 |
public class InfoCrs extends DefaultDialogPanel implements View{
|
|
24 |
public class InfoCrs extends DefaultDialogPanel implements IWindow{
|
|
25 | 25 |
|
26 | 26 |
private static final long serialVersionUID = 1L; |
27 | 27 |
|
... | ... | |
117 | 117 |
} |
118 | 118 |
|
119 | 119 |
public void OkButton_actionPerformed(ActionEvent e) { |
120 |
PluginServices.getMDIManager().closeView(this);
|
|
120 |
PluginServices.getMDIManager().closeWindow(this);
|
|
121 | 121 |
} |
122 | 122 |
|
123 | 123 |
private JLabel getProjcs() { |
... | ... | |
328 | 328 |
return jTable; |
329 | 329 |
} |
330 | 330 |
|
331 |
public ViewInfo getViewInfo() {
|
|
332 |
ViewInfo m_viewinfo=new ViewInfo(ViewInfo.MODALDIALOG);
|
|
331 |
public WindowInfo getWindowInfo() {
|
|
332 |
WindowInfo m_viewinfo=new WindowInfo(WindowInfo.MODALDIALOG);
|
|
333 | 333 |
m_viewinfo.setTitle(PluginServices.getText(this,proj.getCrsWkt().getName())); |
334 | 334 |
return m_viewinfo; |
335 | 335 |
} |
trunk/libraries/libJCRS/src/org/gvsig/crs/ui/TransformationManualPanel.java | ||
---|---|---|
18 | 18 |
import org.cresques.ui.DefaultDialogPanel; |
19 | 19 |
|
20 | 20 |
import com.iver.andami.PluginServices; |
21 |
import com.iver.andami.ui.mdiManager.View;
|
|
22 |
import com.iver.andami.ui.mdiManager.ViewInfo;
|
|
21 |
import com.iver.andami.ui.mdiManager.IWindow;
|
|
22 |
import com.iver.andami.ui.mdiManager.WindowInfo;
|
|
23 | 23 |
import com.iver.cit.gvsig.gui.panels.ProjChooserPanelTransformation; |
24 | 24 |
|
25 |
public class TransformationManualPanel extends DefaultDialogPanel implements View {
|
|
25 |
public class TransformationManualPanel extends DefaultDialogPanel implements IWindow {
|
|
26 | 26 |
|
27 | 27 |
private static final long serialVersionUID = 1L; |
28 | 28 |
|
... | ... | |
321 | 321 |
} |
322 | 322 |
|
323 | 323 |
public void cancelButton_actionPerformed(ActionEvent e) { |
324 |
PluginServices.getMDIManager().closeView(this);
|
|
324 |
PluginServices.getMDIManager().closeWindow(this);
|
|
325 | 325 |
} |
326 | 326 |
|
327 | 327 |
private JButton getButtonAccept() { |
... | ... | |
341 | 341 |
} |
342 | 342 |
|
343 | 343 |
public void acceptButton_actionPerformed(ActionEvent e) { |
344 |
PluginServices.getMDIManager().closeView(this);
|
|
344 |
PluginServices.getMDIManager().closeWindow(this);
|
|
345 | 345 |
} |
346 | 346 |
|
347 | 347 |
public static boolean isPressed() { return pressed; } |
348 | 348 |
|
349 |
public ViewInfo getViewInfo() { |
|
350 |
ViewInfo m_viewinfo=new ViewInfo(ViewInfo.MODALDIALOG); |
|
349 |
|
|
350 |
|
|
351 |
public WindowInfo getWindowInfo() { |
|
352 |
WindowInfo m_viewinfo=new WindowInfo(WindowInfo.MODALDIALOG); |
|
351 | 353 |
m_viewinfo.setTitle(PluginServices.getText(this,"Manual")); |
352 | 354 |
return m_viewinfo; |
353 | 355 |
} |
trunk/libraries/libJCRS/src/org/gvsig/crs/ui/TransformationEpsgPanel.java | ||
---|---|---|
23 | 23 |
import javax.swing.table.DefaultTableModel; |
24 | 24 |
import javax.swing.table.TableColumn; |
25 | 25 |
|
26 |
import org.cresques.cts.CrsException; |
|
27 | 26 |
import org.cresques.cts.IProjection; |
28 | 27 |
import org.cresques.ui.DefaultDialogPanel; |
29 |
import org.gvsig.crs.Crs; |
|
30 | 28 |
import org.gvsig.crs.CrsFactory; |
31 | 29 |
import org.gvsig.crs.ICrs; |
32 | 30 |
import org.gvsig.crs.Query; |
33 | 31 |
import org.gvsig.crs.ogr.GetTransepsg; |
34 | 32 |
|
35 | 33 |
import com.iver.andami.PluginServices; |
36 |
import com.iver.andami.ui.mdiManager.View; |
|
37 |
import com.iver.andami.ui.mdiManager.ViewInfo; |
|
38 |
//import com.iver.cit.gvsig.gui.View; |
|
34 |
import com.iver.andami.ui.mdiManager.IWindow; |
|
35 |
import com.iver.andami.ui.mdiManager.WindowInfo; |
|
39 | 36 |
import com.iver.cit.gvsig.gui.panels.ProjChooserPanelTransformation; |
40 | 37 |
|
41 |
public class TransformationEpsgPanel extends DefaultDialogPanel implements View {
|
|
38 |
public class TransformationEpsgPanel extends DefaultDialogPanel implements IWindow {
|
|
42 | 39 |
|
43 | 40 |
|
44 | 41 |
/** |
... | ... | |
225 | 222 |
} |
226 | 223 |
|
227 | 224 |
public void cancelButton_actionPerformed(ActionEvent e) { |
228 |
PluginServices.getMDIManager().closeView(this);
|
|
225 |
PluginServices.getMDIManager().closeWindow(this);
|
|
229 | 226 |
} |
230 | 227 |
|
231 | 228 |
private JButton getButtonAccept() { |
... | ... | |
247 | 244 |
public void acceptButton_actionPerformed(ActionEvent e) { |
248 | 245 |
GetTransepsg epsgParams = new GetTransepsg(trasnformation_code,pcpt); |
249 | 246 |
setValues(epsgParams.getParamValue()); |
250 |
PluginServices.getMDIManager().closeView(this);
|
|
247 |
PluginServices.getMDIManager().closeWindow(this);
|
|
251 | 248 |
} |
252 | 249 |
|
253 | 250 |
private void callTransformation(int crsCode){ |
... | ... | |
397 | 394 |
public void setProjection(IProjection proj) { |
398 | 395 |
firstProj = proj; |
399 | 396 |
} |
400 |
|
|
401 |
public ViewInfo getViewInfo() {
|
|
402 |
ViewInfo m_viewinfo=new ViewInfo(ViewInfo.MODALDIALOG);
|
|
397 |
|
|
398 |
public WindowInfo getWindowInfo() {
|
|
399 |
WindowInfo m_viewinfo=new WindowInfo(WindowInfo.MODALDIALOG);
|
|
403 | 400 |
m_viewinfo.setTitle("Transformation EPSG"); |
404 | 401 |
return m_viewinfo; |
405 | 402 |
} |
trunk/libraries/libJCRS/src/org/gvsig/crs/ui/WithoutTranformation.java | ||
---|---|---|
16 | 16 |
import org.cresques.ui.DefaultDialogPanel; |
17 | 17 |
|
18 | 18 |
import com.iver.andami.PluginServices; |
19 |
import com.iver.andami.ui.mdiManager.View;
|
|
20 |
import com.iver.andami.ui.mdiManager.ViewInfo;
|
|
19 |
import com.iver.andami.ui.mdiManager.IWindow;
|
|
20 |
import com.iver.andami.ui.mdiManager.WindowInfo;
|
|
21 | 21 |
|
22 |
public class WithoutTranformation extends DefaultDialogPanel implements View {
|
|
22 |
public class WithoutTranformation extends DefaultDialogPanel implements IWindow {
|
|
23 | 23 |
|
24 | 24 |
/** |
25 | 25 |
* |
... | ... | |
126 | 126 |
} |
127 | 127 |
|
128 | 128 |
public void cancelButton_actionPerformed(ActionEvent e) { |
129 |
PluginServices.getMDIManager().closeView(this);
|
|
129 |
PluginServices.getMDIManager().closeWindow(this);
|
|
130 | 130 |
} |
131 | 131 |
|
132 | 132 |
private JButton getButtonAccept() { |
... | ... | |
146 | 146 |
} |
147 | 147 |
|
148 | 148 |
public void acceptButton_actionPerformed(ActionEvent e) { |
149 |
PluginServices.getMDIManager().closeView(this);
|
|
149 |
PluginServices.getMDIManager().closeWindow(this);
|
|
150 | 150 |
} |
151 | 151 |
|
152 |
public ViewInfo getViewInfo() {
|
|
153 |
ViewInfo m_viewinfo=new ViewInfo(ViewInfo.MODALDIALOG);
|
|
152 |
public WindowInfo getWindowInfo() {
|
|
153 |
WindowInfo m_viewinfo=new WindowInfo(WindowInfo.MODALDIALOG);
|
|
154 | 154 |
m_viewinfo.setTitle(PluginServices.getText(this,"Sin Transformacion")); |
155 | 155 |
return m_viewinfo; |
156 | 156 |
} |
trunk/libraries/libJCRS/src/org/gvsig/crs/ui/CRSSelectionDialogPanel.java | ||
---|---|---|
36 | 36 |
contentPane = new CRSSelectionPanel(); |
37 | 37 |
contentPane.setLayout(new GridLayout(3,3)); |
38 | 38 |
contentPane.setLayout(new FlowLayout(FlowLayout.LEFT,10,10)); |
39 |
contentPane.setPreferredSize(new Dimension(650,400));
|
|
39 |
contentPane.setPreferredSize(new Dimension(650,550));
|
|
40 | 40 |
|
41 | 41 |
} |
42 | 42 |
return contentPane; |
trunk/libraries/libJCRS/src/org/gvsig/crs/ui/CRSSelectionPanel.java | ||
---|---|---|
20 | 20 |
import javax.swing.JTable; |
21 | 21 |
import javax.swing.JTextField; |
22 | 22 |
import javax.swing.ListSelectionModel; |
23 |
import javax.swing.event.ListSelectionEvent; |
|
24 |
import javax.swing.event.ListSelectionListener; |
|
25 | 23 |
import javax.swing.table.DefaultTableModel; |
26 | 24 |
import javax.swing.table.TableColumn; |
27 | 25 |
|
... | ... | |
34 | 32 |
import org.gvsig.crs.ogr.GetCRSepsg; |
35 | 33 |
|
36 | 34 |
import com.iver.andami.PluginServices; |
37 |
import com.iver.cit.gvsig.gui.View; |
|
38 | 35 |
import com.iver.cit.gvsig.gui.panels.ProjChooserPanel; |
39 | 36 |
|
40 | 37 |
public class CRSSelectionPanel extends JPanel { |
... | ... | |
262 | 259 |
dtm.addRow(data); |
263 | 260 |
} |
264 | 261 |
} |
265 |
}
|
|
262 |
} |
|
266 | 263 |
|
267 | 264 |
catch (SQLException e1) { |
268 | 265 |
e1.printStackTrace(); |
... | ... | |
540 | 537 |
private JScrollPane getJScrollPane() { |
541 | 538 |
if (jScrollPane == null) { |
542 | 539 |
jScrollPane = new JScrollPane(); |
543 |
jScrollPane.setPreferredSize(new Dimension(600,250));
|
|
540 |
jScrollPane.setPreferredSize(new Dimension(605,250));
|
|
544 | 541 |
jScrollPane.setBorder( |
545 | 542 |
BorderFactory.createCompoundBorder( |
546 | 543 |
BorderFactory.createCompoundBorder( |
... | ... | |
574 | 571 |
info.setSize(new Dimension(550,350)); |
575 | 572 |
info.setLayout(new GridLayout(0,1)); |
576 | 573 |
info.setLayout(new FlowLayout(FlowLayout.LEFT,10,5)); |
577 |
PluginServices.getMDIManager().addView(info);
|
|
574 |
PluginServices.getMDIManager().addWindow(info);
|
|
578 | 575 |
} |
579 | 576 |
|
580 | 577 |
public ICrs getProjection() { |
Also available in: Unified diff