Revision 43256 trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/java/org/gvsig/andami/ui/mdiFrame/DefaultThreadSafeDialogs.java
| DefaultThreadSafeDialogs.java | ||
|---|---|---|
| 33 | 33 |
import java.lang.reflect.Constructor; |
| 34 | 34 |
import javax.swing.JCheckBox; |
| 35 | 35 |
|
| 36 |
import javax.swing.JFileChooser; |
|
| 37 | 36 |
import javax.swing.JLabel; |
| 38 | 37 |
import javax.swing.JOptionPane; |
| 39 | 38 |
import javax.swing.JPanel; |
| ... | ... | |
| 46 | 45 |
import org.gvsig.andami.ui.mdiManager.MDIManager; |
| 47 | 46 |
import org.gvsig.andami.ui.mdiManager.WindowInfo; |
| 48 | 47 |
import org.gvsig.dialogremember.DialogRememeber; |
| 48 |
import org.gvsig.filedialogchooser.FileDialogChooser; |
|
| 49 | 49 |
import org.gvsig.tools.ToolsLocator; |
| 50 | 50 |
import org.gvsig.tools.task.CancellableTask; |
| 51 | 51 |
import org.gvsig.tools.task.RunnableWithParameters; |
| 52 |
import org.gvsig.tools.util.ToolsUtilLocator; |
|
| 52 | 53 |
import org.slf4j.Logger; |
| 53 | 54 |
import org.slf4j.LoggerFactory; |
| 54 | 55 |
|
| ... | ... | |
| 154 | 155 |
DialogRememeber r = null; |
| 155 | 156 |
Object msg = message; |
| 156 | 157 |
if( msgid != null ) {
|
| 157 |
r = PluginsLocator.getDialogRemembereManager().add(msgid);
|
|
| 158 |
r = ToolsUtilLocator.getDialogRemembereManager().add(msgid);
|
|
| 158 | 159 |
if( r.hasValue() ) {
|
| 159 | 160 |
this.returnValue = r.getValue(); |
| 160 | 161 |
return; |
| ... | ... | |
| 275 | 276 |
DialogRememeber r = null; |
| 276 | 277 |
Object msg = message; |
| 277 | 278 |
if (msgid != null) {
|
| 278 |
r = PluginsLocator.getDialogRemembereManager().add(msgid);
|
|
| 279 |
r = ToolsUtilLocator.getDialogRemembereManager().add(msgid);
|
|
| 279 | 280 |
if (r.hasValue() && ((boolean)r.getValue()) ) {
|
| 280 | 281 |
return; |
| 281 | 282 |
} |
| ... | ... | |
| 466 | 467 |
) {
|
| 467 | 468 |
RunnableWithParameters runnable = new RunnableWithParameters() {
|
| 468 | 469 |
public void run() {
|
| 469 |
JFileChooser fc = new JFileChooser(); |
|
| 470 |
// FileDialogChooser fc = new JFileChooserBased(); |
|
| 471 |
FileDialogChooser fc = ToolsUtilLocator.getFileDialogChooserManager().create(); |
|
| 470 | 472 |
fc.setDialogTitle(title); |
| 471 | 473 |
fc.setDialogType(type); |
| 472 | 474 |
fc.setFileSelectionMode(selectionMode); |
| ... | ... | |
| 474 | 476 |
fc.setCurrentDirectory(initialPath); |
| 475 | 477 |
fc.setFileFilter(filter); |
| 476 | 478 |
fc.setFileHidingEnabled(fileHidingEnabled); |
| 477 |
int r = JFileChooser.CANCEL_OPTION;
|
|
| 479 |
int r = FileDialogChooser.CANCEL_OPTION;
|
|
| 478 | 480 |
switch(type) {
|
| 479 |
case JFileChooser.SAVE_DIALOG:
|
|
| 481 |
case FileDialogChooser.SAVE_DIALOG:
|
|
| 480 | 482 |
r = fc.showSaveDialog(getRootComponent()); |
| 481 | 483 |
break; |
| 482 |
case JFileChooser.OPEN_DIALOG:
|
|
| 484 |
case FileDialogChooser.OPEN_DIALOG:
|
|
| 483 | 485 |
default: |
| 484 | 486 |
r = fc.showOpenDialog(getRootComponent()); |
| 485 | 487 |
break; |
| 486 | 488 |
} |
| 487 |
if( r != JFileChooser.APPROVE_OPTION ) {
|
|
| 489 |
if( r != FileDialogChooser.APPROVE_OPTION ) {
|
|
| 488 | 490 |
this.returnValue = null; |
| 489 | 491 |
return; |
| 490 | 492 |
} |
| ... | ... | |
| 508 | 510 |
} |
| 509 | 511 |
|
| 510 | 512 |
public File[] showOpenDirectoryDialog(String title, File initialPath) {
|
| 511 |
return showChooserDialog(title, JFileChooser.OPEN_DIALOG, JFileChooser.DIRECTORIES_ONLY, false, initialPath, null, false);
|
|
| 513 |
return showChooserDialog(title, FileDialogChooser.OPEN_DIALOG, FileDialogChooser.DIRECTORIES_ONLY, false, initialPath, null, false);
|
|
| 512 | 514 |
} |
| 513 | 515 |
|
| 514 | 516 |
|
| 515 | 517 |
public File[] showOpenFileDialog(String title, File initialPath) {
|
| 516 |
return showChooserDialog(title, JFileChooser.OPEN_DIALOG, JFileChooser.FILES_ONLY, false, initialPath, null, false);
|
|
| 518 |
return showChooserDialog(title, FileDialogChooser.OPEN_DIALOG, FileDialogChooser.FILES_ONLY, false, initialPath, null, false);
|
|
| 517 | 519 |
} |
| 518 | 520 |
|
| 519 | 521 |
|
| 520 | 522 |
public File[] showSaveFileDialog(String title, File initialPath) {
|
| 521 |
return showChooserDialog(title, JFileChooser.SAVE_DIALOG, JFileChooser.FILES_ONLY, false, initialPath, null, false);
|
|
| 523 |
return showChooserDialog(title, FileDialogChooser.SAVE_DIALOG, FileDialogChooser.FILES_ONLY, false, initialPath, null, false);
|
|
| 522 | 524 |
} |
| 523 | 525 |
|
| 524 | 526 |
} |
Also available in: Unified diff