Revision 20905 trunk/extensions/extSymbology/src/org/gvsig/symbology/gui/styling/PictureFill.java

View differences:

PictureFill.java
50 50
import java.awt.event.ActionListener;
51 51
import java.io.File;
52 52
import java.io.IOException;
53
import java.net.MalformedURLException;
54 53
import java.net.URL;
55 54
import java.util.ArrayList;
56 55

  
57 56
import javax.swing.JCheckBox;
58
import javax.swing.JFileChooser;
59 57
import javax.swing.JLabel;
60 58
import javax.swing.JPanel;
61 59
import javax.swing.filechooser.FileFilter;
......
63 61
import org.gvsig.gui.beans.swing.GridBagLayoutPanel;
64 62
import org.gvsig.gui.beans.swing.JBlank;
65 63
import org.gvsig.gui.beans.swing.JButton;
64
import org.gvsig.gui.beans.swing.JFileChooser;
66 65
import org.gvsig.gui.beans.swing.JIncrementalNumberField;
67 66
import org.gvsig.symbology.fmap.symbols.PictureFillSymbol;
68 67

  
......
150 149
					return PluginServices.getText(this, "bitmap_and_svg_image_files");
151 150
				}
152 151
			};
153
			JFileChooser jfc = new JFileChooser(lastDir);
152
			JUrlFileChooser jfc = new JUrlFileChooser(getName(), null);
154 153
			jfc.setFileFilter(ff);
155 154
			jfc.setFileSelectionMode(JFileChooser.FILES_ONLY);
156 155
			jfc.setSelectedFile(picFile);
157 156
			jfc.setMultiSelectionEnabled(false);
158 157
			int returnVal = jfc.showOpenDialog(PictureFill.this.owner);
158
//			if(returnVal == JFileChooser.APPROVE_OPTION) {
159
//				File myFile = jfc.getSelectedFile();
160
//				lastDir = jfc.getCurrentDirectory();
161
//				if (myFile != null && myFile.exists()) {
162
//					if(!isSelection){
163
//						picFile = myFile;
164
//					}
165
//					else{
166
//						selPicFile = myFile;	
167
//					}
168
//					try {
169
//						targetLbl.setText(myFile.toURL().toString());
170
//					} catch (MalformedURLException e1) {
171
//						NotificationManager.addError(PluginServices.getText(this, "invalid_url"), e1);
172
//					}
173
//					fireSymbolChangedEvent();
174
//				}
175
//			}
159 176
			if(returnVal == JFileChooser.APPROVE_OPTION) {
160
				File myFile = jfc.getSelectedFile();
177

  
178
				URL url = jfc.getSelectedURL();
179
				if (url == null) return; 
161 180
				lastDir = jfc.getCurrentDirectory();
162
				if (myFile != null && myFile.exists()) {
163
					if(!isSelection){
164
						picFile = myFile;
165
					}
166
					else{
167
						selPicFile = myFile;	
168
					}
169
					try {
170
						targetLbl.setText(myFile.toURL().toString());
171
					} catch (MalformedURLException e1) {
172
						NotificationManager.addError(PluginServices.getText(this, "invalid_url"), e1);
173
					}
174
					fireSymbolChangedEvent();
175
				}
181
				targetLbl.setText(url.toString());
182
				fireSymbolChangedEvent();
176 183
			}
177 184
		}
178 185

  

Also available in: Unified diff