Revision 7738

View differences:

trunk/applications/appgvSIG/src/com/iver/cit/gvsig/Preferences.java
42 42

  
43 43
import com.iver.andami.PluginServices;
44 44
import com.iver.andami.plugins.Extension;
45
import com.iver.cit.gvsig.fmap.MapContext;
46 45
import com.iver.cit.gvsig.fmap.ViewPort;
47 46
import com.iver.cit.gvsig.project.documents.view.gui.View;
48 47

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/preferencespage/ViewPage.java
43 43
*
44 44
* $Id$
45 45
* $Log$
46
* Revision 1.13  2006-10-02 13:38:23  jaume
46
* Revision 1.14  2006-10-02 13:52:34  jaume
47
* organize impots
48
*
49
* Revision 1.13  2006/10/02 13:38:23  jaume
47 50
* *** empty log message ***
48 51
*
49 52
* Revision 1.12  2006/10/02 11:49:23  jaume
......
139 142
import javax.swing.JLabel;
140 143
import javax.swing.JPanel;
141 144
import javax.swing.JTextField;
142
import javax.swing.SwingUtilities;
143 145
import javax.swing.UIManager;
144 146
import javax.swing.plaf.FontUIResource;
145 147

  
......
179 181
	private String fontName;
180 182
	private JCheckBox chkInvisibleNewLayers;
181 183
	private JCheckBox chkKeepScaleOnResizing;
182
	private ColorChooserPanel jcp;
184
	private ColorChooserPanel jccDefaultSelectionColor;
185
	private ColorChooserPanel jccDefaultBackgroundColor;
183 186

  
184 187
	{
185 188
		Enumeration keys = UIManager.getDefaults().keys();
......
250 253
		// just a separator
251 254
		addComponent(new JLabel(" "));
252 255

  
256
		// default background color chooser
257
		jccDefaultBackgroundColor = new ColorChooserPanel();
258
		addComponent(PluginServices.getText(this, "options.view.default_background_color"), jccDefaultBackgroundColor);
259

  
253 260
		// default selection color chooser
254
		jcp = new ColorChooserPanel();
255
		addComponent(PluginServices.getText(this, "options.view.default_selection_color"), jcp);
261
		jccDefaultSelectionColor = new ColorChooserPanel();
262
		addComponent(PluginServices.getText(this, "options.view.default_selection_color"), jccDefaultSelectionColor);
263

  
256 264
		initializeValues();
257 265
	}
258 266

  
......
302 310
		MapContext.ZOOMOUTFACTOR = Double.parseDouble(txtZoomOutFactor.getText());;
303 311

  
304 312
		// Default selection color
305
		jcp.setColor(Project.getDefaultColor());
306
		jcp.setAlpha(255);
313
		jccDefaultBackgroundColor.setColor(Project.getDefaultColor());
314
		jccDefaultBackgroundColor.setAlpha(255);
307 315

  
316
		// Default selection color
317
		jccDefaultSelectionColor.setColor(Project.getDefaultColor());
318
		jccDefaultSelectionColor.setAlpha(255);
319

  
308 320
	}
309 321

  
310 322
	public String getID() {
......
328 340
		try {
329 341
			zif=Double.parseDouble(txtZoomInFactor.getText());
330 342
			zof=Double.parseDouble(txtZoomOutFactor.getText());
331
			color = jcp.getColor();
343
			color = jccDefaultSelectionColor.getColor();
332 344
			Project.setDefaultProjection( CRSFactory.getCRS(projName));
333 345
			Project.setDefaultSelectionColor( color );
334 346
			invisibleNewLayers = chkInvisibleNewLayers.isSelected();
......
357 369
		txtZoomOutFactor.setText(String.valueOf(DEFAULT_ZOOM_OUT_FACTOR));
358 370
		chkInvisibleNewLayers.setSelected(false);
359 371
		chkKeepScaleOnResizing.setSelected(false);
360
		jcp.setColor(FACTORY_DEFAULT_SELECTION_COLOR);
372
		jccDefaultSelectionColor.setColor(FACTORY_DEFAULT_SELECTION_COLOR);
361 373

  
362 374
	}
363 375

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/utils/FontChooser.java
90 90
import javax.swing.JScrollPane;
91 91

  
92 92
import com.iver.andami.PluginServices;
93
import com.iver.andami.Utilities;
94 93
import com.iver.andami.ui.mdiManager.IWindow;
95 94
import com.iver.andami.ui.mdiManager.WindowInfo;
96 95

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/toolListeners/CircleMeasureListener.java
41 41
package com.iver.cit.gvsig.gui.toolListeners;
42 42

  
43 43

  
44
import com.iver.andami.PluginServices;
45
import com.iver.cit.gvsig.fmap.MapContext;
46
import com.iver.cit.gvsig.fmap.MapControl;
47
import com.iver.cit.gvsig.fmap.ViewPort;
48
import com.iver.cit.gvsig.fmap.tools.BehaviorException;
49
import com.iver.cit.gvsig.fmap.tools.Events.MeasureEvent;
50
import com.iver.cit.gvsig.fmap.tools.Listeners.CircleListener;
51

  
52 44
import java.awt.Cursor;
53 45
import java.awt.Image;
54 46
import java.awt.Point;
......
58 50

  
59 51
import javax.swing.ImageIcon;
60 52

  
53
import com.iver.andami.PluginServices;
54
import com.iver.cit.gvsig.fmap.MapContext;
55
import com.iver.cit.gvsig.fmap.MapControl;
56
import com.iver.cit.gvsig.fmap.ViewPort;
57
import com.iver.cit.gvsig.fmap.tools.BehaviorException;
58
import com.iver.cit.gvsig.fmap.tools.Events.MeasureEvent;
59
import com.iver.cit.gvsig.fmap.tools.Listeners.CircleListener;
61 60

  
61

  
62 62
/**
63 63
 * Implementaci?n de la interfaz CircleListener como herramienta para
64 64
 * realizar una medicion circular
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/toolListeners/InfoListener.java
63 63
import com.iver.cit.gvsig.fmap.DriverException;
64 64
import com.iver.cit.gvsig.fmap.MapControl;
65 65
import com.iver.cit.gvsig.fmap.ViewPort;
66
import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
66 67
import com.iver.cit.gvsig.fmap.layers.FBitSet;
67 68
import com.iver.cit.gvsig.fmap.layers.FLayer;
68 69
import com.iver.cit.gvsig.fmap.layers.FLyrVect;
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/toolListeners/MeasureListener.java
40 40
 */
41 41
package com.iver.cit.gvsig.gui.toolListeners;
42 42

  
43
import java.awt.Point;
44 43
import java.awt.geom.Point2D;
45 44
import java.text.NumberFormat;
46 45

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/toolListeners/MapOverviewPanListener.java
40 40
 */
41 41
package com.iver.cit.gvsig.gui.toolListeners;
42 42

  
43
import com.iver.andami.PluginServices;
44

  
45
import com.iver.cit.gvsig.fmap.MapControl;
46
import com.iver.cit.gvsig.fmap.ViewPort;
47
import com.iver.cit.gvsig.fmap.tools.BehaviorException;
48
import com.iver.cit.gvsig.fmap.tools.Events.MoveEvent;
49
import com.iver.cit.gvsig.fmap.tools.Events.PointEvent;
50
import com.iver.cit.gvsig.fmap.tools.Listeners.PanListener;
51
import com.iver.cit.gvsig.fmap.tools.Listeners.PointListener;
52
import com.iver.cit.gvsig.project.documents.view.MapOverview;
53

  
54 43
import java.awt.Cursor;
55 44
import java.awt.Image;
56 45
import java.awt.Point;
......
62 51

  
63 52
import javax.swing.ImageIcon;
64 53

  
54
import com.iver.cit.gvsig.fmap.MapControl;
55
import com.iver.cit.gvsig.fmap.ViewPort;
56
import com.iver.cit.gvsig.fmap.tools.BehaviorException;
57
import com.iver.cit.gvsig.fmap.tools.Events.MoveEvent;
58
import com.iver.cit.gvsig.fmap.tools.Listeners.PanListener;
59
import com.iver.cit.gvsig.project.documents.view.MapOverview;
65 60

  
61

  
66 62
/**
67 63
 * DOCUMENT ME!
68 64
 *
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/toolListeners/RectangleSelectListener.java
43 43
import com.iver.andami.PluginServices;
44 44
import com.iver.cit.gvsig.fmap.MapControl;
45 45
import com.iver.cit.gvsig.fmap.tools.BehaviorException;
46
import com.iver.cit.gvsig.fmap.tools.RectangleSelectionListener;
46 47
import com.iver.cit.gvsig.fmap.tools.Events.RectangleEvent;
47
import com.iver.cit.gvsig.fmap.tools.RectangleSelectionListener;
48 48

  
49 49

  
50 50
/**
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/toolListeners/MapOverviewListener.java
40 40
 */
41 41
package com.iver.cit.gvsig.gui.toolListeners;
42 42

  
43
import com.iver.andami.PluginServices;
44

  
45
import com.iver.cit.gvsig.fmap.MapControl;
46
import com.iver.cit.gvsig.fmap.ViewPort;
47
import com.iver.cit.gvsig.fmap.tools.BehaviorException;
48
import com.iver.cit.gvsig.fmap.tools.Events.PointEvent;
49
import com.iver.cit.gvsig.fmap.tools.Listeners.PointListener;
50
import com.iver.cit.gvsig.project.documents.view.MapOverview;
51

  
52 43
import java.awt.Cursor;
53 44
import java.awt.Image;
54 45
import java.awt.Point;
......
58 49

  
59 50
import javax.swing.ImageIcon;
60 51

  
52
import com.iver.andami.PluginServices;
53
import com.iver.cit.gvsig.fmap.MapControl;
54
import com.iver.cit.gvsig.fmap.ViewPort;
55
import com.iver.cit.gvsig.fmap.tools.BehaviorException;
56
import com.iver.cit.gvsig.fmap.tools.Events.PointEvent;
57
import com.iver.cit.gvsig.fmap.tools.Listeners.PointListener;
58
import com.iver.cit.gvsig.project.documents.view.MapOverview;
61 59

  
60

  
62 61
/**
63 62
 * DOCUMENT ME!
64 63
 *
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/toolListeners/AreaListener.java
40 40
 */
41 41
package com.iver.cit.gvsig.gui.toolListeners;
42 42

  
43
import java.awt.Point;
44 43
import java.awt.geom.Point2D;
45 44
import java.text.NumberFormat;
46 45

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/toolListeners/ZoomInListener.java
41 41
package com.iver.cit.gvsig.gui.toolListeners;
42 42

  
43 43
import com.iver.andami.PluginServices;
44

  
45 44
import com.iver.cit.gvsig.fmap.MapControl;
46
import com.iver.cit.gvsig.fmap.tools.Events.RectangleEvent;
47 45
import com.iver.cit.gvsig.fmap.tools.ZoomInListenerImpl;
46
import com.iver.cit.gvsig.fmap.tools.Events.RectangleEvent;
48 47

  
49 48

  
50 49
/**
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/toolListeners/ZoomOutListener.java
41 41
package com.iver.cit.gvsig.gui.toolListeners;
42 42

  
43 43
import com.iver.andami.PluginServices;
44

  
45 44
import com.iver.cit.gvsig.fmap.MapControl;
46
import com.iver.cit.gvsig.fmap.tools.Events.PointEvent;
47 45
import com.iver.cit.gvsig.fmap.tools.ZoomOutListenerImpl;
46
import com.iver.cit.gvsig.fmap.tools.Events.PointEvent;
48 47

  
49 48

  
50 49
/**
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/toolListeners/PanListener.java
41 41
package com.iver.cit.gvsig.gui.toolListeners;
42 42

  
43 43
import com.iver.andami.PluginServices;
44

  
45 44
import com.iver.cit.gvsig.fmap.MapControl;
46
import com.iver.cit.gvsig.fmap.tools.Events.MoveEvent;
47 45
import com.iver.cit.gvsig.fmap.tools.PanListenerImpl;
46
import com.iver.cit.gvsig.fmap.tools.Events.MoveEvent;
48 47

  
49 48

  
50 49
/**
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/toolListeners/MapOverviewChangeZoomListener.java
4 4
package com.iver.cit.gvsig.gui.toolListeners;
5 5

  
6 6
import java.awt.Cursor;
7
import java.awt.Event;
8 7
import java.awt.Image;
9 8
import java.awt.Point;
10 9
import java.awt.Toolkit;
11 10
import java.awt.event.InputEvent;
12 11
import java.awt.event.MouseEvent;
13
import java.awt.geom.Point2D;
14 12
import java.awt.geom.Rectangle2D;
15 13

  
16 14
import javax.swing.ImageIcon;
......
18 16
import com.iver.cit.gvsig.fmap.MapControl;
19 17
import com.iver.cit.gvsig.fmap.ViewPort;
20 18
import com.iver.cit.gvsig.fmap.tools.BehaviorException;
21
import com.iver.cit.gvsig.fmap.tools.ZoomInListenerImpl;
22 19
import com.iver.cit.gvsig.fmap.tools.Events.MoveEvent;
23 20
import com.iver.cit.gvsig.fmap.tools.Events.RectangleEvent;
24
import com.iver.cit.gvsig.fmap.tools.Listeners.RectangleListener;
25 21
import com.iver.cit.gvsig.fmap.tools.Listeners.PanListener;
22
import com.iver.cit.gvsig.fmap.tools.Listeners.RectangleListener;
26 23
import com.iver.cit.gvsig.project.documents.view.MapOverview;
27 24

  
28 25
/**
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/simpleWizard/SimpleWizard.java
1 1
package com.iver.cit.gvsig.gui.simpleWizard;
2 2

  
3 3
import java.awt.BorderLayout;
4
import java.util.Map;
5 4

  
6 5
import javax.swing.ImageIcon;
7 6
import javax.swing.JPanel;
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/tables/Columns.java
1 1
package com.iver.cit.gvsig.gui.tables;
2 2

  
3
import java.util.ArrayList;
4

  
3 5
import com.iver.utiles.XMLEntity;
4 6

  
5
import java.util.ArrayList;
6 7

  
7

  
8 8
/**
9 9
 * DOCUMENT ME!
10 10
 *
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/Layout.java
88 88

  
89 89
import com.iver.andami.PluginServices;
90 90
import com.iver.andami.messages.NotificationManager;
91
import com.iver.andami.ui.mdiManager.IWindowListener;
91 92
import com.iver.andami.ui.mdiManager.SingletonWindow;
92 93
import com.iver.andami.ui.mdiManager.WindowInfo;
93
import com.iver.andami.ui.mdiManager.IWindowListener;
94 94
import com.iver.cit.gvsig.AddLayer;
95 95
import com.iver.cit.gvsig.fmap.ColorEvent;
96 96
import com.iver.cit.gvsig.fmap.DriverException;
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/fframes/FFrameNorth.java
44 44
import com.iver.cit.gvsig.project.documents.exceptions.SaveException;
45 45
import com.iver.cit.gvsig.project.documents.layout.fframes.IFFrame;
46 46
import com.iver.cit.gvsig.project.documents.layout.fframes.IFFrameViewDependence;
47

  
48 47
import com.iver.utiles.XMLEntity;
49 48

  
50 49

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/fframes/FFramePicture.java
44 44
 */
45 45
package com.iver.cit.gvsig.gui.layout.fframes;
46 46

  
47
import com.iver.andami.PluginServices;
48
import com.iver.andami.messages.NotificationManager;
47
import java.awt.Dimension;
48
import java.awt.Graphics2D;
49
import java.awt.Image;
50
import java.awt.RenderingHints;
51
import java.awt.geom.AffineTransform;
52
import java.awt.geom.Rectangle2D;
53
import java.awt.image.BufferedImage;
54
import java.io.File;
49 55

  
50
import com.iver.cit.gvsig.fmap.DriverException;
51
import com.iver.cit.gvsig.gui.layout.Layout;
52
import com.iver.cit.gvsig.project.documents.exceptions.SaveException;
53
import com.iver.cit.gvsig.project.documents.layout.fframes.IFFrame;
56
import javax.swing.ImageIcon;
54 57

  
55
import com.iver.utiles.XMLEntity;
56

  
57
import com.sun.jimi.core.Jimi;
58

  
59 58
import org.apache.batik.bridge.BridgeContext;
60 59
import org.apache.batik.bridge.DocumentLoader;
61 60
import org.apache.batik.bridge.GVTBuilder;
......
63 62
import org.apache.batik.bridge.ViewBox;
64 63
import org.apache.batik.gvt.GraphicsNode;
65 64
import org.apache.batik.gvt.renderer.StaticRenderer;
66

  
67 65
import org.w3c.dom.Document;
68 66
import org.w3c.dom.Element;
69 67
import org.w3c.dom.svg.SVGDocument;
70 68

  
71
import java.awt.Dimension;
72
import java.awt.Graphics2D;
73
import java.awt.Image;
74
import java.awt.RenderingHints;
75
import java.awt.geom.AffineTransform;
76
import java.awt.geom.Rectangle2D;
77
import java.awt.image.BufferedImage;
69
import com.iver.andami.PluginServices;
70
import com.iver.andami.messages.NotificationManager;
71
import com.iver.cit.gvsig.fmap.DriverException;
72
import com.iver.cit.gvsig.gui.layout.Layout;
73
import com.iver.cit.gvsig.project.documents.exceptions.SaveException;
74
import com.iver.cit.gvsig.project.documents.layout.fframes.IFFrame;
75
import com.iver.utiles.XMLEntity;
76
import com.sun.jimi.core.Jimi;
78 77

  
79
import java.io.File;
80 78

  
81
import javax.swing.ImageIcon;
82

  
83

  
84 79
/**
85 80
 * FFrame para introducir una imagen en el Layout o para dibujar sobre el
86 81
 * graphics un SVG.
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/fframes/FFrameGroup.java
44 44
 */
45 45
package com.iver.cit.gvsig.gui.layout.fframes;
46 46

  
47
import java.awt.Graphics2D;
48
import java.awt.geom.AffineTransform;
49
import java.awt.geom.Point2D;
50
import java.awt.geom.Rectangle2D;
51
import java.awt.image.BufferedImage;
52
import java.util.ArrayList;
53

  
47 54
import com.iver.andami.PluginServices;
48 55
import com.iver.andami.messages.NotificationManager;
49

  
50 56
import com.iver.cit.gvsig.fmap.DriverException;
51 57
import com.iver.cit.gvsig.gui.layout.Layout;
52 58
import com.iver.cit.gvsig.project.Project;
......
57 63
import com.iver.cit.gvsig.project.documents.layout.fframes.IFFrameLayoutDependence;
58 64
import com.iver.cit.gvsig.project.documents.layout.fframes.IFFrameUseProject;
59 65
import com.iver.cit.gvsig.project.documents.layout.fframes.IFFrameViewDependence;
60

  
61 66
import com.iver.utiles.XMLEntity;
62 67

  
63
import java.awt.Graphics2D;
64
import java.awt.geom.AffineTransform;
65
import java.awt.geom.Point2D;
66
import java.awt.geom.Rectangle2D;
67
import java.awt.image.BufferedImage;
68 68

  
69
import java.util.ArrayList;
70

  
71

  
72 69
/**
73 70
 * FFrame que contiene a su vez un ArrayList de FFrames de cualquier tipo
74 71
 * incluso de si mismo.
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/fframes/FFrameScaleBar.java
44 44
 */
45 45
package com.iver.cit.gvsig.gui.layout.fframes;
46 46

  
47
import com.iver.andami.PluginServices;
48

  
49
import com.iver.cit.gvsig.fmap.DriverException;
50
import com.iver.cit.gvsig.fmap.MapContext;
51
import com.iver.cit.gvsig.gui.layout.Attributes;
52
import com.iver.cit.gvsig.gui.layout.Layout;
53
import com.iver.cit.gvsig.project.documents.exceptions.SaveException;
54
import com.iver.cit.gvsig.project.documents.layout.FLayoutUtilities;
55
import com.iver.cit.gvsig.project.documents.layout.fframes.IFFrame;
56
import com.iver.cit.gvsig.project.documents.layout.fframes.IFFrameViewDependence;
57

  
58
import com.iver.utiles.StringUtilities;
59
import com.iver.utiles.XMLEntity;
60

  
61 47
import java.awt.BasicStroke;
62 48
import java.awt.Color;
63 49
import java.awt.Font;
......
68 54
import java.awt.geom.Point2D;
69 55
import java.awt.geom.Rectangle2D;
70 56
import java.awt.image.BufferedImage;
71

  
72 57
import java.text.NumberFormat;
73 58

  
59
import com.iver.andami.PluginServices;
60
import com.iver.cit.gvsig.fmap.DriverException;
61
import com.iver.cit.gvsig.fmap.MapContext;
62
import com.iver.cit.gvsig.gui.layout.Attributes;
63
import com.iver.cit.gvsig.gui.layout.Layout;
64
import com.iver.cit.gvsig.project.documents.exceptions.SaveException;
65
import com.iver.cit.gvsig.project.documents.layout.FLayoutUtilities;
66
import com.iver.cit.gvsig.project.documents.layout.fframes.IFFrame;
67
import com.iver.cit.gvsig.project.documents.layout.fframes.IFFrameViewDependence;
68
import com.iver.utiles.StringUtilities;
69
import com.iver.utiles.XMLEntity;
74 70

  
75 71

  
72

  
76 73
/**
77 74
 * FFrame para introducir una barra de escala en el Layout.
78 75
 *
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/fframes/FFrameLegend.java
52 52
import com.iver.andami.PluginServices;
53 53
import com.iver.cit.gvsig.fmap.DriverException;
54 54
import com.iver.cit.gvsig.fmap.core.ISymbol;
55
import com.iver.cit.gvsig.fmap.core.v02.FGraphicUtilities;
56 55
import com.iver.cit.gvsig.fmap.core.v02.FSymbol;
57 56
import com.iver.cit.gvsig.fmap.layers.FLayer;
58 57
import com.iver.cit.gvsig.fmap.layers.FLayers;
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/fframes/FFrame.java
44 44
 */
45 45
package com.iver.cit.gvsig.gui.layout.fframes;
46 46

  
47
import java.awt.Color;
48
import java.awt.Cursor;
49
import java.awt.Font;
50
import java.awt.Graphics2D;
51
import java.awt.Image;
52
import java.awt.Rectangle;
53
import java.awt.event.MouseEvent;
54
import java.awt.geom.AffineTransform;
55
import java.awt.geom.Point2D;
56
import java.awt.geom.Rectangle2D;
57
import java.awt.image.BufferedImage;
58
import java.net.URL;
59

  
60
import javax.swing.ImageIcon;
61

  
47 62
import com.iver.andami.PluginServices;
48 63
import com.iver.andami.messages.NotificationManager;
49

  
50 64
import com.iver.cit.gvsig.AddLayer;
51 65
import com.iver.cit.gvsig.ProjectExtension;
52 66
import com.iver.cit.gvsig.fmap.DriverException;
......
60 74
import com.iver.cit.gvsig.project.documents.layout.fframes.IFFrameUseProject;
61 75
import com.iver.cit.gvsig.project.documents.layout.fframes.IFFrameViewDependence;
62 76
import com.iver.cit.gvsig.project.documents.layout.gui.dialogs.Tag;
63

  
64 77
import com.iver.utiles.XMLEntity;
65 78

  
66
import java.awt.Color;
67
import java.awt.Cursor;
68
import java.awt.Font;
69
import java.awt.Graphics2D;
70
import java.awt.Image;
71
import java.awt.Rectangle;
72
import java.awt.event.MouseEvent;
73
import java.awt.geom.AffineTransform;
74
import java.awt.geom.Point2D;
75
import java.awt.geom.Rectangle2D;
76
import java.awt.image.BufferedImage;
77 79

  
78
import java.net.URL;
79

  
80
import javax.swing.ImageIcon;
81

  
82

  
83 80
/**
84 81
 * Clase que implementa la interface IFFrame con los m?todos por defecto de
85 82
 * todos los FFrames  que extenderan de este, dejando uno como m?todo
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/fframes/FFrameText.java
44 44
 */
45 45
package com.iver.cit.gvsig.gui.layout.fframes;
46 46

  
47
import com.iver.andami.PluginServices;
48

  
49
import com.iver.cit.gvsig.gui.layout.Layout;
50
import com.iver.cit.gvsig.project.documents.exceptions.SaveException;
51
import com.iver.cit.gvsig.project.documents.layout.FLayoutUtilities;
52
import com.iver.cit.gvsig.project.documents.layout.fframes.IFFrame;
53

  
54
import com.iver.utiles.StringUtilities;
55
import com.iver.utiles.XMLEntity;
56

  
57 47
import java.awt.Color;
58 48
import java.awt.Font;
59 49
import java.awt.Graphics2D;
......
62 52
import java.awt.geom.AffineTransform;
63 53
import java.awt.geom.Rectangle2D;
64 54
import java.awt.image.BufferedImage;
65

  
66 55
import java.util.ArrayList;
67 56

  
57
import com.iver.andami.PluginServices;
58
import com.iver.cit.gvsig.gui.layout.Layout;
59
import com.iver.cit.gvsig.project.documents.exceptions.SaveException;
60
import com.iver.cit.gvsig.project.documents.layout.FLayoutUtilities;
61
import com.iver.cit.gvsig.project.documents.layout.fframes.IFFrame;
62
import com.iver.utiles.StringUtilities;
63
import com.iver.utiles.XMLEntity;
68 64

  
65

  
69 66
/**
70 67
 * FFrame para introducir un texto en el Layout.
71 68
 *
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/command/CommandStackDialog.java
20 20
import org.gvsig.gui.beans.DefaultBean;
21 21

  
22 22
import com.iver.andami.PluginServices;
23
import com.iver.andami.ui.mdiManager.IWindowListener;
23 24
import com.iver.andami.ui.mdiManager.SingletonWindow;
24 25
import com.iver.andami.ui.mdiManager.WindowInfo;
25
import com.iver.andami.ui.mdiManager.IWindowListener;
26 26
import com.iver.cit.gvsig.AddLayer;
27 27
import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
28 28
import com.iver.cit.gvsig.fmap.edition.commands.AddRowCommand;
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/panels/FPanelCreateField.java
41 41
package com.iver.cit.gvsig.gui.panels;
42 42

  
43 43
import java.awt.BorderLayout;
44
import java.awt.GridLayout;
44 45
import java.awt.LayoutManager;
45 46
import java.awt.event.ActionListener;
46 47
import java.awt.event.KeyEvent;
47 48
import java.awt.event.KeyListener;
48 49
import java.sql.Types;
49 50
import java.text.ParseException;
50
import java.util.Vector;
51 51

  
52 52
import javax.swing.JComboBox;
53 53
import javax.swing.JLabel;
......
56 56

  
57 57
import org.gvsig.gui.beans.AcceptCancelPanel;
58 58

  
59
import com.hardcode.gdbms.engine.instruction.SemanticException;
60 59
import com.hardcode.gdbms.engine.values.ValueFactory;
61 60
import com.iver.andami.PluginServices;
62 61
import com.iver.andami.ui.mdiManager.IWindow;
63 62
import com.iver.andami.ui.mdiManager.WindowInfo;
64 63
import com.iver.cit.gvsig.fmap.drivers.FieldDescription;
65
import java.awt.GridLayout;
66 64

  
67 65
public class FPanelCreateField extends JPanel implements IWindow {
68 66

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/panels/ProjChooserPanel.java
3 3
 */
4 4
package com.iver.cit.gvsig.gui.panels;
5 5

  
6
import java.awt.FlowLayout;
6 7
import java.awt.event.ActionListener;
7 8

  
8 9
import javax.swing.JLabel;
......
14 15
import com.iver.andami.PluginServices;
15 16
import com.iver.cit.gvsig.project.documents.view.info.gui.CSSelectionDialog;
16 17

  
17
import java.awt.GridLayout;
18
import java.awt.FlowLayout;
19

  
20 18
/**
21 19
 * @author Luis W. Sevilla (sevilla_lui@gva.es)
22 20
 */
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/panels/TextFieldEdit.java
26 26
import com.iver.cit.gvsig.fmap.core.IRow;
27 27
import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
28 28
import com.iver.cit.gvsig.fmap.edition.EditionEvent;
29
import com.iver.cit.gvsig.fmap.edition.IEditableSource;
30 29
import com.iver.cit.gvsig.fmap.edition.IRowEdited;
31 30
import com.iver.cit.gvsig.fmap.edition.VectorialEditableAdapter;
32 31
import com.iver.cit.gvsig.fmap.layers.FLyrAnnotation;
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/panels/FPanelAbout.java
60 60
import javax.swing.JLabel;
61 61
import javax.swing.JPanel;
62 62
import javax.swing.JScrollPane;
63
import javax.swing.JTabbedPane;
63 64
import javax.swing.event.HyperlinkEvent;
64 65

  
65 66
import org.apache.log4j.Logger;
66 67

  
67
import com.hardcode.gdbms.engine.instruction.Utilities;
68 68
import com.iver.andami.PluginServices;
69 69
import com.iver.andami.ui.mdiManager.IWindow;
70 70
import com.iver.andami.ui.mdiManager.WindowInfo;
71 71
import com.iver.cit.gvsig.Version;
72

  
73
import javax.swing.JTabbedPane;
74 72
/**
75 73
 * @author FJP
76 74
 *
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/panels/MappingFieldsToAnotation.java
2 2

  
3 3
import java.sql.Types;
4 4

  
5
import javax.swing.ButtonGroup;
6
import javax.swing.JButton;
7
import javax.swing.JComboBox;
8
import javax.swing.JLabel;
5 9
import javax.swing.JPanel;
10
import javax.swing.JRadioButton;
11
import javax.swing.JTextField;
6 12

  
7 13
import com.hardcode.gdbms.engine.data.driver.DriverException;
8 14
import com.iver.andami.PluginServices;
......
12 18
import com.iver.cit.gvsig.fmap.layers.MappingAnnotation;
13 19
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource;
14 20

  
15
import javax.swing.ButtonGroup;
16
import javax.swing.JComboBox;
17
import javax.swing.JLabel;
18
import javax.swing.JButton;
19
import javax.swing.JTextField;
20
import javax.swing.JRadioButton;
21

  
22 21
public class MappingFieldsToAnotation extends JPanel implements IWindow{
23 22

  
24 23
	private JComboBox cmbText = null;
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/panels/annotation/SelectAnnotationLayerNameAndField.java
4 4
import java.awt.Rectangle;
5 5
import java.awt.event.ItemEvent;
6 6
import java.awt.event.ItemListener;
7
import java.util.HashMap;
8
import java.util.Map;
9 7

  
10
import javax.swing.ComboBoxModel;
11 8
import javax.swing.JComboBox;
12 9
import javax.swing.JLabel;
13 10
import javax.swing.JTextField;
14 11
import javax.swing.event.CaretEvent;
15 12
import javax.swing.event.CaretListener;
16 13

  
14
import jwizardcomponent.JWizardComponents;
15
import jwizardcomponent.JWizardPanel;
16

  
17 17
import com.iver.andami.PluginServices;
18 18
import com.iver.cit.gvsig.fmap.DriverException;
19 19
import com.iver.cit.gvsig.fmap.layers.FLyrAnnotation;
20 20
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource;
21 21

  
22
import jwizardcomponent.JWizardComponents;
23
import jwizardcomponent.JWizardPanel;
24

  
25 22
public class SelectAnnotationLayerNameAndField extends JWizardPanel {
26 23
	private FLyrAnnotation layer;
27 24
	
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/filter/FilterDialog.java
67 67
import com.iver.andami.PluginServices;
68 68
import com.iver.andami.messages.NotificationManager;
69 69
import com.iver.andami.ui.mdiManager.IWindow;
70
import com.iver.andami.ui.mdiManager.IWindowListener;
70 71
import com.iver.andami.ui.mdiManager.WindowInfo;
71
import com.iver.andami.ui.mdiManager.IWindowListener;
72 72
import com.iver.cit.gvsig.project.documents.table.gui.Table;
73 73
import com.iver.utiles.DefaultCharSet;
74 74
import com.iver.utiles.StringUtilities;
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/TableRowsOperations.java
1 1
package com.iver.cit.gvsig;
2 2

  
3
import com.hardcode.driverManager.DriverLoadException;
3
import java.io.IOException;
4
import java.sql.Types;
5
import java.util.BitSet;
4 6

  
7
import com.hardcode.driverManager.DriverLoadException;
5 8
import com.hardcode.gdbms.engine.data.driver.DriverException;
6
import com.hardcode.gdbms.engine.values.NumericValue;
7

  
8 9
import com.iver.andami.PluginServices;
9 10
import com.iver.andami.messages.NotificationManager;
10 11
import com.iver.andami.plugins.Extension;
11 12
import com.iver.andami.ui.mdiManager.IWindow;
12

  
13 13
import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
14 14
import com.iver.cit.gvsig.fmap.layers.FBitSet;
15 15
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource;
16
import com.iver.cit.gvsig.project.documents.table.gui.Statistics;
17 16
import com.iver.cit.gvsig.project.documents.table.gui.Table;
18 17

  
19
import java.io.IOException;
20
import java.math.BigDecimal;
21 18

  
22
import java.sql.Types;
23

  
24
import java.util.BitSet;
25

  
26

  
27 19
/**
28 20
 * DOCUMENT ME!
29 21
 *
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/InitialWarningExtension.java
43 43
*
44 44
* $Id$
45 45
* $Log$
46
* Revision 1.3  2006-08-29 07:56:27  cesar
46
* Revision 1.4  2006-10-02 13:52:34  jaume
47
* organize impots
48
*
49
* Revision 1.3  2006/08/29 07:56:27  cesar
47 50
* Rename the *View* family of classes to *Window* (ie: SingletonView to SingletonWindow, ViewInfo to WindowInfo, etc)
48 51
*
49 52
* Revision 1.2  2006/08/29 07:13:53  cesar
......
56 59
*/
57 60
package com.iver.cit.gvsig;
58 61

  
59
import java.util.prefs.Preferences;
60

  
61 62
import javax.swing.JButton;
62 63
import javax.swing.JCheckBox;
63 64
import javax.swing.JLabel;
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/AddLayer.java
70 70
import com.iver.cit.gvsig.gui.WizardPanel;
71 71
import com.iver.cit.gvsig.project.documents.gui.FOpenDialog;
72 72
import com.iver.cit.gvsig.project.documents.gui.FileOpenDialog;
73
import com.iver.cit.gvsig.project.documents.view.gui.IView;
74 73
import com.iver.cit.gvsig.project.documents.view.gui.BaseView;
75
import com.iver.cit.gvsig.project.documents.view.gui.View;
74
import com.iver.cit.gvsig.project.documents.view.gui.IView;
76 75

  
77 76

  
78 77
/**
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/InfoToolExtension.java
55 55
import com.iver.cit.gvsig.fmap.layers.FLayer;
56 56
import com.iver.cit.gvsig.project.documents.view.IProjectView;
57 57
import com.iver.cit.gvsig.project.documents.view.gui.View;
58
import com.iver.cit.gvsig.project.documents.view.ProjectView;
59 58

  
60 59

  
61 60
/**
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/ThemeControls.java
67 67
import com.iver.cit.gvsig.fmap.layers.FLayer;
68 68
import com.iver.cit.gvsig.fmap.layers.FLyrVect;
69 69
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource;
70
import com.iver.cit.gvsig.fmap.layers.layerOperations.Selectable;
71 70
import com.iver.cit.gvsig.fmap.operations.strategies.SelectedShapeVisitor;
72 71
import com.iver.cit.gvsig.fmap.operations.strategies.VisitException;
73 72
import com.iver.cit.gvsig.project.documents.view.IProjectView;
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/ClearSelectionExtension.java
47 47
package com.iver.cit.gvsig;
48 48

  
49 49
import com.iver.andami.PluginServices;
50
import com.iver.andami.messages.NotificationListener;
51 50
import com.iver.andami.messages.NotificationManager;
52 51
import com.iver.andami.plugins.Extension;
53 52
import com.iver.cit.gvsig.fmap.DriverException;
54 53
import com.iver.cit.gvsig.fmap.MapContext;
55 54
import com.iver.cit.gvsig.fmap.MapControl;
56
import com.iver.cit.gvsig.fmap.layers.FLayer;
57 55
import com.iver.cit.gvsig.fmap.layers.FLyrVect;
58 56
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource;
59 57
import com.iver.cit.gvsig.project.documents.table.ProjectTable;
60 58
import com.iver.cit.gvsig.project.documents.table.gui.Table;
61 59
import com.iver.cit.gvsig.project.documents.view.IProjectView;
62
import com.iver.cit.gvsig.project.documents.view.ProjectView;
63 60
import com.iver.cit.gvsig.project.documents.view.gui.View;
64 61

  
65 62

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/FiltroExtension.java
63 63
import com.iver.cit.gvsig.gui.filter.FilterDialog;
64 64
import com.iver.cit.gvsig.project.documents.table.gui.Table;
65 65
import com.iver.cit.gvsig.project.documents.view.IProjectView;
66
import com.iver.cit.gvsig.project.documents.view.ProjectView;
67 66
import com.iver.utiles.exceptionHandling.ExceptionListener;
68 67

  
69 68

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/RasterExtension.java
49 49
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource;
50 50
import com.iver.cit.gvsig.project.documents.view.IProjectView;
51 51
import com.iver.cit.gvsig.project.documents.view.gui.View;
52
import com.iver.cit.gvsig.project.documents.view.ProjectView;
53 52

  
54 53

  
55 54
/**
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/TableEditStopExtension.java
5 5
import javax.swing.JOptionPane;
6 6

  
7 7
import com.iver.andami.PluginServices;
8
import com.iver.andami.messages.NotificationManager;
9 8
import com.iver.andami.plugins.Extension;
10 9
import com.iver.andami.ui.mdiManager.IWindow;
11
import com.iver.cit.gvsig.fmap.MapControl;
12
import com.iver.cit.gvsig.fmap.edition.EditionEvent;
13
import com.iver.cit.gvsig.fmap.edition.EditionException;
14
import com.iver.cit.gvsig.fmap.edition.ISpatialWriter;
15
import com.iver.cit.gvsig.fmap.edition.VectorialEditableAdapter;
16
import com.iver.cit.gvsig.fmap.layers.FLyrVect;
17 10
import com.iver.cit.gvsig.project.documents.table.gui.Table;
18 11

  
19 12

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/LayoutControls.java
47 47
package com.iver.cit.gvsig;
48 48

  
49 49
import java.awt.Component;
50
import java.awt.event.KeyEvent;
51 50
import java.io.File;
52 51
import java.io.FileWriter;
53 52

  
54 53
import javax.swing.JFileChooser;
55
import javax.swing.KeyStroke;
56 54

  
57 55
import org.apache.log4j.Logger;
58 56
import org.exolab.castor.xml.Marshaller;
......
63 61
import com.iver.andami.ui.mdiManager.IWindow;
64 62
import com.iver.cit.gvsig.gui.layout.Layout;
65 63
import com.iver.cit.gvsig.project.documents.layout.FLayoutZooms;
66
import com.iver.cit.gvsig.project.documents.layout.LayoutKeyEvent;
67 64
import com.iver.utiles.GenericFileFilter;
68 65

  
69 66

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/DEMO/SingleView.java
52 52
import java.awt.Point;
53 53
import java.awt.event.KeyAdapter;
54 54
import java.awt.event.KeyEvent;
55
import java.awt.event.MouseAdapter;
56
import java.awt.event.MouseEvent;
57 55
import java.awt.event.WindowEvent;
58 56
import java.awt.event.WindowListener;
59 57
import java.awt.geom.Point2D;
......
85 83
import com.iver.cit.gvsig.fmap.layers.LayerFactory;
86 84
import com.iver.cit.gvsig.fmap.tools.PanListenerImpl;
87 85
import com.iver.cit.gvsig.fmap.tools.RectangleSelectionListener;
88
import com.iver.cit.gvsig.fmap.tools.ZoomInListenerImpl;
89 86
import com.iver.cit.gvsig.fmap.tools.ZoomOutListenerImpl;
90 87
import com.iver.cit.gvsig.fmap.tools.ZoomOutRightButtonListener;
91 88
import com.iver.cit.gvsig.fmap.tools.Behavior.Behavior;
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/DEMO/PruebasGT2.java
65 65

  
66 66
import com.iver.cit.gvsig.fmap.MapContext;
67 67
import com.iver.cit.gvsig.fmap.layers.CancelationException;
68
import com.iver.cit.gvsig.fmap.layers.FLayer;
69 68
import com.iver.cit.gvsig.fmap.layers.FLyrGT2;
70 69
import com.iver.cit.gvsig.fmap.layers.FLyrGT2_old;
71
import com.iver.cit.gvsig.fmap.layers.LayerFactory;
72 70
import com.vividsolutions.jts.geom.LineString;
73 71
import com.vividsolutions.jts.geom.MultiLineString;
74 72
import com.vividsolutions.jts.geom.MultiPoint;
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/gui/FOpenDialog.java
49 49
import java.awt.BorderLayout;
50 50
import java.awt.event.ActionListener;
51 51

  
52
import javax.swing.JButton;
53 52
import javax.swing.JDialog;
54 53
import javax.swing.JPanel;
55 54
import javax.swing.JTabbedPane;
......
62 61
import com.iver.andami.PluginServices;
63 62
import com.iver.andami.ui.mdiManager.IWindow;
64 63
import com.iver.andami.ui.mdiManager.WindowInfo;
65
import com.iver.cit.gvsig.ProjectExtension;
66 64
import com.iver.cit.gvsig.gui.WizardPanel;
67 65
import com.iver.cit.gvsig.gui.wizards.WizardListener;
68 66
import com.iver.cit.gvsig.project.Project;
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/gui/FileOpenDialog.java
50 50
import java.io.File;
51 51
import java.util.ArrayList;
52 52
import java.util.Comparator;
53
import java.util.HashSet;
54 53
import java.util.Iterator;
55 54
import java.util.TreeSet;
56 55
import java.util.prefs.Preferences;
......
61 60
import javax.swing.filechooser.FileFilter;
62 61

  
63 62
import org.cresques.cts.IProjection;
64
import org.cresques.cts.ProjectionPool;
65 63

  
66 64
import com.hardcode.driverManager.Driver;
67 65
import com.hardcode.driverManager.DriverLoadException;
......
74 72
import com.iver.cit.gvsig.fmap.drivers.VectorialFileDriver;
75 73
import com.iver.cit.gvsig.fmap.layers.LayerFactory;
76 74
import com.iver.cit.gvsig.gui.panels.ProjChooserPanel;
77
import com.iver.cit.gvsig.project.documents.view.gui.View;
78 75
import com.iver.utiles.listManager.ListManagerListener;
79 76
/**
80 77
 * Di?logo para cargar las dieferentes capas a la vista.
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/ProjectDocument.java
47 47
import java.util.Date;
48 48

  
49 49
import com.hardcode.driverManager.DriverLoadException;
50
import com.iver.andami.PluginServices;
51 50
import com.iver.andami.messages.NotificationManager;
52 51
import com.iver.andami.ui.mdiManager.IWindow;
53
import com.iver.andami.ui.mdiManager.WindowInfo;
54 52
import com.iver.cit.gvsig.fmap.DriverException;
55 53
import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
56 54
import com.iver.cit.gvsig.fmap.layers.CancelationException;
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/table/ProjectTable.java
170 170
//		mapping = new int[sds.getFieldCount()+1];
171 171
//		alias = new String[sds.getFieldCount()+1];
172 172
//		for (int i = 0; i < sds.getFieldCount()+1; i++) {
173
		mapping = new int[sds.getFieldCount()];
173
//		mapping = new int[sds.getFieldCount()];
174 174
		alias = new String[sds.getFieldCount()];
175 175
		for (int i = 0; i < sds.getFieldCount(); i++) {
176
			mapping[i]=i;
176
//			mapping[i]=i;
177 177
			alias[i]=sds.getFieldName(i);
178 178

  
179 179
//			if (i==0){
......
798 798
		// TODO Auto-generated method stub
799 799

  
800 800
	}
801
	
801

  
802 802
	private void setTheModel(IEditableSource es) {
803 803
		this.esModel = es;
804 804

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/table/EditionTable.java
8 8
import com.iver.cit.gvsig.fmap.drivers.FieldDescription;
9 9
import com.iver.cit.gvsig.fmap.edition.EditionException;
10 10

  
11
import javax.swing.JPanel;
12 11

  
13

  
14 12
/**
15 13
 * DOCUMENT ME!
16 14
 *
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/table/gui/TableProperties.java
41 41
package com.iver.cit.gvsig.project.documents.table.gui;
42 42

  
43 43

  
44
import java.awt.FlowLayout;
45

  
46 44
import javax.swing.JPanel;
47 45
import javax.swing.JTable;
48 46

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/table/gui/DataBaseOpenDialog.java
47 47
import javax.swing.JPasswordField;
48 48
import javax.swing.JTextField;
49 49

  
50
import com.hardcode.driverManager.DriverLoadException;
51 50
import com.iver.andami.PluginServices;
52
import com.iver.andami.messages.NotificationManager;
53 51
import com.iver.cit.gvsig.fmap.layers.LayerFactory;
54 52
/**
55 53
 * DOCUMENT ME!
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/table/gui/Table.java
51 51
import java.beans.PropertyChangeEvent;
52 52
import java.beans.PropertyChangeListener;
53 53
import java.io.IOException;
54
import java.sql.Types;
55 54
import java.text.ParseException;
56 55
import java.util.BitSet;
57
import java.util.Enumeration;
58
import java.util.EventListener;
59 56
import java.util.EventObject;
60 57

  
61 58
import javax.swing.BorderFactory;
......
67 64
import javax.swing.JOptionPane;
68 65
import javax.swing.JPanel;
69 66
import javax.swing.JTextField;
70
import javax.swing.ListSelectionModel;
71 67
import javax.swing.UIManager;
72 68
import javax.swing.border.Border;
73 69
import javax.swing.event.ListSelectionEvent;
74 70
import javax.swing.event.ListSelectionListener;
75
import javax.swing.event.TableColumnModelEvent;
76
import javax.swing.event.TableColumnModelListener;
77 71
import javax.swing.table.AbstractTableModel;
78 72
import javax.swing.table.DefaultTableColumnModel;
79 73
import javax.swing.table.TableCellRenderer;
......
88 82
import com.iver.andami.PluginServices;
89 83
import com.iver.andami.messages.NotificationManager;
90 84
import com.iver.andami.ui.mdiFrame.MainFrame;
85
import com.iver.andami.ui.mdiManager.IWindowListener;
86
import com.iver.andami.ui.mdiManager.IWindowTransform;
91 87
import com.iver.andami.ui.mdiManager.SingletonWindow;
92 88
import com.iver.andami.ui.mdiManager.WindowInfo;
93
import com.iver.andami.ui.mdiManager.IWindowListener;
94
import com.iver.andami.ui.mdiManager.IWindowTransform;
95 89
import com.iver.cit.gvsig.fmap.MapContext;
96 90
import com.iver.cit.gvsig.fmap.core.DefaultFeature;
97 91
import com.iver.cit.gvsig.fmap.core.DefaultRow;
......
1181 1175
//        	if (col==0)
1182 1176
//        		return " ";
1183 1177
//        	col--;
1184
        	int i=pt.getMapping()[col];
1185
        	return pt.getAliases()[i];
1178
        	return pt.getAliases()[col];
1179
//        	int i=pt.getMapping()[col];
1180
//        	return pt.getAliases()[i];
1186 1181
        }
1187 1182

  
1188 1183
        /**
......
1334 1329
			return super.getTotalColumnWidth();
1335 1330
		}
1336 1331

  
1337
		public void moveColumn(int arg0, int arg1) {
1338
			//super.moveColumn(arg0, arg1);
1339
			if (arg0==arg1){
1340
				super.moveColumn(arg0,arg1);
1332
		public void moveColumn(int columnIndex, int newIndex) {
1333
			String[] aliases = getModel().getAliases();
1334
			if (columnIndex != newIndex) {
1335
				String aux = aliases[getModel().getMapping()[columnIndex]];
1336
				aliases[getModel().getMapping()[columnIndex]] = aliases[getModel().getMapping()[newIndex]];
1337
				aliases[getModel().getMapping()[newIndex]] = aux;
1338
				/*int[] mapping = getModel().getMapping();
1339
				int mappedColumnIndex = mapping[columnIndex];
1340
				int mappedNewIndex = mapping[newIndex];
1341
				mapping[columnIndex] = mappedNewIndex;
1342
				mapping[newIndex] = mappedColumnIndex;
1343
				String aux = aliases[mappedColumnIndex];
1344
				aliases[mappedColumnIndex] = aliases[mappedNewIndex];
1345
				aliases[mappedNewIndex] = aux;
1346
				*/
1341 1347
			}
1348
			super.moveColumn(columnIndex, newIndex);
1349

  
1342 1350
		}
1343 1351

  
1344 1352

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/table/gui/PopupMenu.java
40 40
 */
41 41
package com.iver.cit.gvsig.project.documents.table.gui;
42 42

  
43
import com.hardcode.gdbms.engine.data.driver.DriverException;
44

  
45
import com.iver.andami.PluginServices;
46

  
47
import com.iver.cit.gvsig.AddLayer;
48
import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
49
import com.iver.cit.gvsig.fmap.edition.EditionException;
50

  
51 43
import java.awt.Point;
52 44
import java.awt.event.ActionEvent;
53 45
import java.awt.event.ActionListener;
......
57 49
import javax.swing.JMenuItem;
58 50
import javax.swing.JPopupMenu;
59 51

  
52
import com.iver.andami.PluginServices;
53
import com.iver.cit.gvsig.AddLayer;
54
import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
60 55

  
56

  
61 57
/**
62 58
 * PopupMenu with options to operate on the table.
63 59
 *
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/table/gui/TableModel.java
50 50
import com.iver.andami.PluginServices;
51 51
import com.iver.andami.messages.NotificationManager;
52 52
import com.iver.cit.gvsig.fmap.edition.IEditableSource;
53
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource;
54 53
import com.iver.cit.gvsig.project.documents.table.ProjectTable;
55 54

  
56 55

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/table/gui/AndamiWizard.java
2 2

  
3 3
import com.iver.andami.ui.mdiManager.IWindow;
4 4
import com.iver.andami.ui.mdiManager.WindowInfo;
5

  
6 5
import com.iver.utiles.swing.wizard.Wizard;
7 6

  
8 7

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/table/ProjectTableFactory.java
1 1
package com.iver.cit.gvsig.project.documents.table;
2 2

  
3
import com.hardcode.driverManager.DriverLoadException;
3
import java.io.File;
4
import java.text.DateFormat;
5
import java.util.Date;
4 6

  
7
import javax.swing.ImageIcon;
8
import javax.swing.JPanel;
9

  
10
import com.hardcode.driverManager.DriverLoadException;
5 11
import com.hardcode.gdbms.engine.data.DataSource;
6 12
import com.hardcode.gdbms.engine.data.DataSourceFactory;
7 13
import com.hardcode.gdbms.engine.data.NoSuchTableException;
8 14
import com.hardcode.gdbms.engine.data.driver.DBDriver;
9 15
import com.hardcode.gdbms.engine.data.driver.DriverException;
10 16
import com.hardcode.gdbms.engine.data.driver.FileDriver;
11

  
12 17
import com.iver.andami.PluginServices;
13 18
import com.iver.andami.messages.NotificationManager;
14

  
15 19
import com.iver.cit.gvsig.fmap.edition.EditableAdapter;
16 20
import com.iver.cit.gvsig.fmap.edition.IEditableSource;
17 21
import com.iver.cit.gvsig.fmap.layers.LayerFactory;
......
25 29
import com.iver.cit.gvsig.project.documents.table.gui.DataBaseOpenDialog;
26 30
import com.iver.cit.gvsig.project.documents.table.gui.Table;
27 31

  
28
import java.io.File;
29 32

  
30
import java.text.DateFormat;
31

  
32
import java.util.Date;
33

  
34
import javax.swing.ImageIcon;
35
import javax.swing.JPanel;
36

  
37

  
38 33
/**
39 34
 * Factory of Table.
40 35
 *
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/table/ObjectSelectionStep.java
2 2

  
3 3
import com.iver.utiles.swing.objectSelection.ObjectSelection;
4 4
import com.iver.utiles.swing.wizard.Step;
5
import com.iver.utiles.swing.wizard.Wizard;
6 5
import com.iver.utiles.swing.wizard.WizardControl;
7 6

  
8 7

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/view/ProjectViewFactory.java
1 1
package com.iver.cit.gvsig.project.documents.view;
2 2

  
3
import com.iver.andami.PluginServices;
3
import java.text.DateFormat;
4
import java.util.ArrayList;
5
import java.util.Date;
4 6

  
7
import javax.swing.ImageIcon;
8

  
9
import com.iver.andami.PluginServices;
5 10
import com.iver.cit.gvsig.fmap.MapContext;
6 11
import com.iver.cit.gvsig.fmap.ViewPort;
7 12
import com.iver.cit.gvsig.project.Project;
8 13
import com.iver.cit.gvsig.project.documents.ProjectDocument;
9 14
import com.iver.cit.gvsig.project.documents.ProjectDocumentFactory;
10 15

  
11
import java.text.DateFormat;
12 16

  
13
import java.util.ArrayList;
14
import java.util.Date;
15

  
16
import javax.swing.ImageIcon;
17

  
18

  
19 17
/**
20 18
 * Factory of View.
21 19
 *
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/view/IProjectView.java
4 4

  
5 5
import com.iver.cit.gvsig.fmap.MapContext;
6 6
import com.iver.cit.gvsig.project.Project;
7
import com.iver.andami.ui.mdiManager.IWindow;
8 7

  
9 8
public interface IProjectView {
10 9

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/view/info/gui/InfoToolViewer.java
4 4
import java.awt.event.ComponentEvent;
5 5
import java.awt.event.ComponentListener;
6 6
import java.util.Vector;
7

  
7 8
import javax.swing.JList;
8 9
import javax.swing.JPanel;
9 10
import javax.swing.event.ListSelectionListener;
10 11
import javax.swing.tree.DefaultMutableTreeNode;
11 12
import javax.swing.tree.DefaultTreeModel;
12 13
import javax.swing.tree.TreePath;
14

  
13 15
import org.xml.sax.ContentHandler;
14 16
import org.xml.sax.SAXException;
15 17

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/view/legend/NaturalIntervalGenerator.java
40 40
 */
41 41
package com.iver.cit.gvsig.project.documents.view.legend;
42 42

  
43
import java.awt.Component;
44
import java.util.ArrayList;
45

  
46
import javax.swing.JOptionPane;
47

  
43 48
import com.hardcode.gdbms.engine.data.driver.DriverException;
44 49
import com.hardcode.gdbms.engine.values.DoubleValue;
45 50
import com.hardcode.gdbms.engine.values.FloatValue;
......
48 53
import com.hardcode.gdbms.engine.values.NullValue;
49 54
import com.hardcode.gdbms.engine.values.ShortValue;
50 55
import com.hardcode.gdbms.engine.values.Value;
51

  
52 56
import com.iver.andami.PluginServices;
53 57
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource;
54 58
import com.iver.cit.gvsig.fmap.layers.layerOperations.AlphanumericData;
55 59

  
56
import java.awt.Component;
57
import java.util.ArrayList;
58 60

  
59
import javax.swing.JOptionPane;
60

  
61

  
62 61
/**
63 62
 * Calcula los intervalos naturales.
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff