Author: tchemit Date: 2008-02-15 17:37:21 +0000 (Fri, 15 Feb 2008) New Revision: 1009 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportAction.java trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ImportDialog.jaxx Log: import action Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportAction.java 2008-02-15 17:03:52 UTC (rev 1008) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportAction.java 2008-02-15 17:37:21 UTC (rev 1009) @@ -25,6 +25,8 @@ import java.awt.event.ActionEvent; import java.io.File; +import java.util.Map; +import java.util.TreeMap; import static org.codelutin.i18n.I18n.*; @@ -48,10 +50,13 @@ protected File f; protected Boolean remote; private static final long serialVersionUID = 3377670691203328711L; + private Map<String, String[]> filters; public ImportAction(String name) { super(name); - ui = new ImportDialog(getMainUI()); + filters = new TreeMap<String,String[]>(); + filters.put("ApplicationExploration",new String[]{".*.zip$",_("simexplorer.choose.applicationexploration")}); + filters.put("Library",new String[]{".*.zip$",_("simexplorer.choose.library")}); } public void disposeUI() { @@ -94,7 +99,7 @@ protected ImportDialog getUi(Boolean remote) { if (ui == null) { - ui = new ImportDialog(getMainUI()); + ui = new ImportDialog(getMainUI(),filters); } ui.setTitle(remote? _("simexplorer.action.import.remote.tooltip"):_("simexplorer.action.import.local.tooltip")); ui.getTypeImport().setSelected(ui.getSelected().getModel(),true); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ImportDialog.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ImportDialog.jaxx 2008-02-15 17:03:52 UTC (rev 1008) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ImportDialog.jaxx 2008-02-15 17:37:21 UTC (rev 1009) @@ -19,24 +19,30 @@ return f; } +private java.util.Map<String, String[]> filters; + protected void chooseDir() { - File dir= org.codelutin.util.FileUtil.getFile(new String[0]); + String type = (String) getTypeImport().getSelectedValue(); + String[] filter = this.filters.get(type); + File dir= org.codelutin.util.FileUtil.getFile(filter==null?null:filter); if (dir!=null) { filePath.setText(dir.toString()); } } -public ImportDialog(JFrame frame) { +protected void check() { + String t = filePath.getText(); + java.io.File f = new File(t); + ok.setEnabled(!t.equals("") && f.exists() && f.isFile()); +} + +public ImportDialog(JFrame frame,java.util.Map<String,String[]> filters) { super(frame,true); JRootPane rootPane = getRootPane(); rootPane.setDefaultButton(ok); rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"),"cancel"); - rootPane.getActionMap().put("cancel", cancelAction); + rootPane.getActionMap().put("cancel", cancelAction); + this.filters = filters; } -protected void check() { - String t = filePath.getText(); - java.io.File f = new File(t); - ok.setEnabled(!t.equals("") && f.exists() && f.isFile()); -} </script> <Table> <row fill='vertical'>