Author: tchemit Date: 2008-02-09 16:36:22 +0000 (Sat, 09 Feb 2008) New Revision: 783 Removed: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JConfigUI.jaxx Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/actions/SimExplorerCommonActions.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: utilisation ui generique du commandline Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-02-09 16:10:53 UTC (rev 782) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-02-09 16:36:22 UTC (rev 783) @@ -18,7 +18,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui; -import fr.cemagref.simexplorer.is.ui.swing.JConfigUI; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; @@ -26,6 +25,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import org.codelutin.i18n.I18n; import org.codelutin.option.ui.ConfigTableModel; +import org.codelutin.option.ui.ConfigUI; import java.awt.event.ActionEvent; import java.io.IOException; @@ -59,7 +59,7 @@ public static void reloadUI() { ui = null; SimExplorerActionManager.resetCache(); - JConfigUI.reloadUI(); + ConfigUI.reloadUI(); SimExplorerTab.getFactory().resetCache(); // must remove listener on data model ? DetailTabModel detailModel = ((DetailTabModel) SimExplorerTab.detail.getModel()); @@ -145,7 +145,7 @@ // show edit config if first launch if (SimExplorer.context.isFirstLaunch()) { - JConfigUI.showUI(context.getConfig(), ConfigTableModel.TypeModel.all); + ConfigUI.showUI(context.getConfig(), ConfigTableModel.TypeModel.all); } // launch ui only if required Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/actions/SimExplorerCommonActions.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/actions/SimExplorerCommonActions.java 2008-02-09 16:10:53 UTC (rev 782) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/actions/SimExplorerCommonActions.java 2008-02-09 16:36:22 UTC (rev 783) @@ -22,12 +22,12 @@ import fr.cemagref.simexplorer.is.ui.configs.SimExplorerAbstractConfigMain; import fr.cemagref.simexplorer.is.ui.options.SimExplorerOptionEditConfig; import fr.cemagref.simexplorer.is.ui.options.SimExplorerOptionShowConfig; -import fr.cemagref.simexplorer.is.ui.swing.JConfigUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; import org.codelutin.option.Config; import org.codelutin.option.ui.ConfigTableModel; +import org.codelutin.option.ui.ConfigUI; import java.io.IOException; import java.io.StringWriter; @@ -100,11 +100,11 @@ SimExplorerAbstractConfigMain conf; conf = getParser().getMainConfig(); if (isAll()) { - JConfigUI.showUI(conf, ConfigTableModel.TypeModel.all); + ConfigUI.showUI(conf, ConfigTableModel.TypeModel.all); } else if (isTec()) { - JConfigUI.showTechnicalUI(conf); + ConfigUI.showTechnicalUI(conf); } else { - JConfigUI.showUI(conf); + ConfigUI.showUI(conf); } StringWriter writer = new StringWriter(); Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java 2008-02-09 16:10:53 UTC (rev 782) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java 2008-02-09 16:36:22 UTC (rev 783) @@ -18,9 +18,9 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; -import fr.cemagref.simexplorer.is.ui.swing.JConfigUI; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; import org.codelutin.option.ui.ConfigTableModel; +import org.codelutin.option.ui.ConfigUI; /** * Action pour afficher la dialogue de modification de configuration @@ -46,6 +46,6 @@ @Override public void doAction(java.awt.event.ActionEvent e) { - JConfigUI.showUI(getContext().getConfig(), ConfigTableModel.TypeModel.all); + ConfigUI.showUI(getContext().getConfig(), ConfigTableModel.TypeModel.all); } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-09 16:10:53 UTC (rev 782) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-09 16:36:22 UTC (rev 783) @@ -107,13 +107,10 @@ simexplorer.action.unconnect.help= simexplorer.action.unconnect.tooltip=Disconnect from remote server simexplorer.change.config.property= -simexplorer.common.cancel=cancel simexplorer.common.creationDate=create date simexplorer.common.description=description simexplorer.common.key=key simexplorer.common.name=name -simexplorer.common.ok=ok -simexplorer.common.reset=reset simexplorer.common.type=type simexplorer.common.value=value simexplorer.common.version=version @@ -137,7 +134,6 @@ simexplorer.config.main.userMail.description=User email adress simexplorer.config.main.version.description=Version of application simexplorer.config.menu=Configuration -simexplorer.config.title=SimExplorer SI configuration modifier simexplorer.error.load.actions.class=could not found for action key {0} class {1} simexplorer.error.load.actions.file=could not load actions.properties file for reason {0} simexplorer.error.unfound.config.property= Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-09 16:10:53 UTC (rev 782) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-09 16:36:22 UTC (rev 783) @@ -107,13 +107,10 @@ simexplorer.action.unconnect.help= simexplorer.action.unconnect.tooltip=Se d\u00E9connecter du serveur distant simexplorer.change.config.property= -simexplorer.common.cancel=annuler simexplorer.common.creationDate=date de cr\u00E9ation simexplorer.common.description=description simexplorer.common.key=nom descriptor simexplorer.common.name=nom -simexplorer.common.ok=appliquer -simexplorer.common.reset=r\u00E9initialiser simexplorer.common.type=type simexplorer.common.value=valeur simexplorer.common.version=version @@ -137,7 +134,6 @@ simexplorer.config.main.userMail.description=Le courriel de l'utilisateur simexplorer.config.main.version.description=La version du logiciel simexplorer.config.menu=Configuration -simexplorer.config.title=SimExplorer SI Pr\u00E9f\u00E9rences simexplorer.error.load.actions.class=could not found for action key {0} class {1} simexplorer.error.load.actions.file=could not load actions.properties file for reason {0} simexplorer.error.unfound.config.property= Deleted: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JConfigUI.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JConfigUI.jaxx 2008-02-09 16:10:53 UTC (rev 782) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JConfigUI.jaxx 2008-02-09 16:36:22 UTC (rev 783) @@ -1,149 +0,0 @@ -<JDialog title='{_("simexplorer.config.title")}' modal='true' defaultCloseOperation='DISPOSE_ON_CLOSE'> - <script> - import static org.codelutin.i18n.I18n._; - import org.codelutin.option.ui.ConfigTableModel; - import org.codelutin.option.ui.ConfigTableRenderer; - import org.codelutin.option.ui.ConfigTableEditor; - import org.codelutin.option.Config; - - private static JConfigUI instance; - - public static JConfigUI getInstance() { - if (instance == null) { - instance = new JConfigUI(); - } - return instance; - } - - public static void reloadUI() { - instance=null; - } - - public static void showUI(Config config) { - showUI(config,null); - } - - public static void showTechnicalUI(Config config) { - showUI(config, ConfigTableModel.TypeModel.tech); - } - - public static void showUI(Config config,ConfigTableModel.TypeModel type) { - getInstance().setConfig(config,type); - getInstance().setVisible(true); - } - - protected Config config; - protected ConfigTableModel model; - - private AbstractAction OK_ACTION; - private AbstractAction RESET_ACTION; - private AbstractAction CANCEL_ACTION; - private TableModelListener TABLE_MODEL_LISTENER; - - @Override - public void dispose() { - config=null; - if (model!=null) { - model.removeTableModelListener(TABLE_MODEL_LISTENER); - model = null; - } - super.dispose(); - } - - protected Config getConfig() { - return config; - } - - protected ConfigTableModel getModel() { - return model; - } - - protected boolean isEmpty() { - return model==null || config==null || config.getUniverse().isEmpty(); - } - - protected boolean isOkEnabled() { - return !isEmpty() && model.isValid(); - } - - protected boolean isResetEnabled() { - return !isEmpty() && model.isModified(); - } - - protected void setConfig(Config config, ConfigTableModel.TypeModel type) { - this.config = config; - model = new ConfigTableModel(config,type); - model.addTableModelListener(TABLE_MODEL_LISTENER); - main.setModel(model); - main.setDefaultRenderer(Object.class, new ConfigTableRenderer(model)); - main.getColumn(main.getColumnName(1)).setCellEditor(new ConfigTableEditor(getModel())); - boolean action = type != ConfigTableModel.TypeModel.tech; - butons.setVisible(action); - butons2.setVisible(!action); - model.fireTableDataChanged(); - pack(); - } - - OK_ACTION= new AbstractAction("OK") { - private static final long serialVersionUID = -5259317388353753566L; - public void actionPerformed(ActionEvent e) { - if (!isEmpty() && getModel().isModified()) { - getModel().transfertModified(getConfig()); - getConfig().saveSafely(); - } - dispose(); - } - }; - RESET_ACTION= new AbstractAction("Reset") { - private static final long serialVersionUID = 3780134639606303504L; - public void actionPerformed(ActionEvent e) { - getModel().reset(); - } - }; - CANCEL_ACTION = new AbstractAction("Cancel") { - private static final long serialVersionUID = -3391009906183633110L; - public void actionPerformed(ActionEvent e) { - dispose(); - } - }; - TABLE_MODEL_LISTENER = new TableModelListener() { - public void tableChanged(TableModelEvent e) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - processDataBinding("ok.enabled"); - processDataBinding("reset.enabled"); - } - }); - } - }; - JRootPane rootPane = getRootPane(); - rootPane.setDefaultButton(ok); - rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "cancel"); - rootPane.getActionMap().put("cancel", CANCEL_ACTION); - </script> - <Table weightx="1"> - <row> - <cell weighty="1" weightx='1' fill='both'> - <JScrollPane id='scroll' verticalScrollBarPolicy='20' horizontalScrollBarPolicy='31' > - <JTable id="main" rowSelectionAllowed="false" autoResizeMode='auto_resize_last_column'/> - </JScrollPane> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JPanel id='butons' visible='false' layout='{new GridLayout(0, 3, 2, 2)}'> - <JButton id='ok' text='{_("simexplorer.common.ok")}' enabled='{isOkEnabled()}' action='{OK_ACTION}'/> - <JButton id='reset' text='{_("simexplorer.common.reset")}' enabled='{isResetEnabled()}' action='{RESET_ACTION}'/> - <JButton id='cancel' text='{_("simexplorer.common.cancel")}' action='{CANCEL_ACTION}'/> - </JPanel> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JPanel id='butons2' visible='false' layout='{new GridLayout(0, 1, 2, 2)}'> - <JButton text='{_("simexplorer.common.ok")}' onActionPerformed='dispose();'/> - </JPanel> - </cell> - </row> - </Table> -</JDialog>