[Jrst-commits] r713 - in trunk/jrst/src/main: java/org/nuiton/jrst java/org/nuiton/jrst/jaxxUI resources

12 Jun 2012

Author: jpages
Date: 2012-06-12 18:19:42 +0200 (Tue, 12 Jun 2012)
New Revision: 713

Url: http://nuiton.org/repositories/revision/jrst/713

Log:
Suite du passage de l'interface graphique en Jaxx : ajout d'un model et d'un xslPanel


Added:
   trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/JRSTCommandModel.java
   trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/XslPanel.jaxx
   trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/XslPanelHandler.java
Modified:
   trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java
   trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/JRSTView.jaxx
   trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/JRSTViewHandler.java
   trunk/jrst/src/main/resources/log4j.properties

Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java
===================================================================

--- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java	2012-06-11 15:57:48 UTC (rev 712)
+++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java	2012-06-12 16:19:42 UTC (rev 713)
@@ -37,7 +37,6 @@
 import java.io.Reader;
 import java.net.URL;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -64,6 +63,8 @@
 import org.python.util.PythonInterpreter;
 import org.xhtmlrenderer.pdf.ITextRenderer;
 
+import static org.nuiton.i18n.I18n._;
+
 /**
  * FIXME: 'JRST --help' doesn't work, but 'JRST --help toto' work :( FIXME:
  * 'JRST -c' doesn't work, but 'JRST -c toto'
@@ -269,10 +270,54 @@
         return graph.getCmd();
         */
         JRSTView jrstView = new JRSTView();
+        jrstView.pack();
         jrstView.setVisible(true);
 
-        jrstView.pack();
-        return jrstView.getHandler().getCmd();
+        log.info("test");
+        boolean exit = false;
+        String[] command = new String[]{};
+        if (!jrstView.getModel().isOverwrite()) {
+            File file = new File(jrstView.getModel().getSaveLocationText());
+            if (file.exists()) {
+               int choix = jrstView.getHandler().askEcraser();
+               if (choix == JOptionPane.YES_OPTION)
+                   jrstView.setOverwrite(true);
+               else if (choix == JOptionPane.NO_OPTION)
+                   exit = true;
+            }
+        }
+        if (!exit) {
+            String cmd = "";
+        if (jrstView.isOverwrite())
+           cmd += "--force ";
+        if (jrstView.isSimpleMode()) {
+           cmd += "--simple ";
+        }
+        if (jrstView.getFormat().isSelected())
+           cmd += "-t " + jrstView.getFormatList().getSelectedItem();
+        else {
+           cmd += "-x ";
+
+            for (int i = 0; i <jrstView.getXslListPanel().getComponentCount(); i++ ) {
+                JPanel panel = (JPanel)jrstView.getXslListPanel().getComponent(i);
+                for(JTextField c : panel.getComponents()) {
+                    c.setEnabled(false);
+                }
+            }
+
+            for (JTextField t : jrstView.getXslListPanel().getComponent()) {
+               if (!t.getText().equals(""))
+                   cmd += t.getText() + ",";
+           }
+           cmd = cmd.substring(0, cmd.length() - 1);
+        }
+        if (jrstView.getSaveText().getText().length() > 0)
+           cmd += " -o " + jrstView.getSaveText().getText();
+            cmd += " " + jrstView.getOpenText().getText() + " ";
+            command = cmd.trim().split(" ");
+            jrstView.dispose();
+        }
+        return command;
     }
 
     /**

Added: trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/JRSTCommandModel.java
===================================================================
--- trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/JRSTCommandModel.java	                        (rev 0)
+++ trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/JRSTCommandModel.java	2012-06-12 16:19:42 UTC (rev 713)
@@ -0,0 +1,163 @@
+package org.nuiton.jrst.jaxxUI;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Created: 08/06/12
+ *
+ * @author jpages <j.pages@codelutin.com>
+ */
+public class JRSTCommandModel {
+    protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
+
+
+    protected Boolean overwrite = Boolean.FALSE;
+    protected Boolean simpleMode = Boolean.FALSE;
+    protected Boolean formatEnabled = Boolean.TRUE;
+
+    protected String in;
+    protected String out;
+
+    protected String saveLocationText;
+    protected String openLocationText;
+
+    protected int panelNumber = 0;
+
+    protected List<String> xslList;
+
+    public Boolean isOverwrite() {
+        return overwrite;
+    }
+
+    public void setOverwrite(Boolean overwrite) {
+        Boolean oldValue = isOverwrite();
+        this.overwrite = overwrite;
+        firePropertyChange("overwrite", oldValue, overwrite);
+    }
+
+    public Boolean isSimpleMode() {
+        return simpleMode;
+    }
+
+    public void setSimpleMode(Boolean simpleMode) {
+        Boolean oldValue = isSimpleMode();
+        this.simpleMode = simpleMode;
+        firePropertyChange("simpleMode", oldValue, simpleMode);
+    }
+
+    public Boolean isFormatEnabled() {
+        return formatEnabled;
+    }
+
+    public void setFormatEnabled(Boolean formatEnabled) {
+        Boolean oldValue = isFormatEnabled();
+        this.formatEnabled = formatEnabled;
+        firePropertyChange("formatEnabled", oldValue, formatEnabled);
+    }
+
+    public String getIn() {
+        return in;
+    }
+
+    public void setIn(String in) {
+        String oldValue = getIn();
+        this.in = in;
+        firePropertyChange("in", oldValue, in);
+    }
+
+    public String getOut() {
+        return out;
+    }
+
+    public void setOut(String out) {
+        String oldValue = getOut();
+        this.out = out;
+        firePropertyChange("out", oldValue, out);
+    }
+
+    public String getSaveLocationText() {
+        return saveLocationText;
+    }
+
+    public void setSaveLocationText(String saveLocationText) {
+        String oldValue = getSaveLocationText();
+        this.saveLocationText = saveLocationText;
+        firePropertyChange("saveLocationText", oldValue, saveLocationText);
+    }
+
+    public String getOpenLocationText() {
+        return openLocationText;
+    }
+
+    public void setOpenLocationText(String openLocationText) {
+        String oldValue = getOpenLocationText();
+        this.openLocationText = openLocationText;
+        firePropertyChange("openLocationText", oldValue, openLocationText);
+    }
+
+    public List<String> getXslList() {
+        return xslList;
+    }
+
+    public void setXslList(List<String> xslList) {
+        List<String> oldValue = getXslList();
+        this.xslList = xslList;
+        firePropertyChange("xslList", oldValue, xslList);
+    }
+
+    public String getElementXslList(Integer number) {
+        String text = xslList.get(number);
+        return text;
+    }
+
+    public void setElementXslList(Integer number, String text) {
+        List<String> oldValue = getXslList();
+        if(number == xslList.size()) {
+            xslList.add(text);
+        } else {
+            xslList.set(number, text);
+        }
+        firePropertyChange("xslList", oldValue, xslList);
+    }
+
+    public int getPanelNumber() {
+        return panelNumber;
+    }
+
+    public void incrementPanelNumber() {
+        setPanelNumber(getPanelNumber() + 1);
+    }
+
+    public void setPanelNumber(int panelNumber) {
+        int oldValue = getPanelNumber();
+        this.panelNumber = panelNumber;
+        firePropertyChange("panelNumber", oldValue, panelNumber);
+    }
+
+    public String getCommand(){
+        //TODO
+    }
+
+    public void addPropertyChangeListener(PropertyChangeListener listener) {
+        pcs.addPropertyChangeListener(listener);
+    }
+
+    public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) {
+        pcs.addPropertyChangeListener(propertyName, listener);
+    }
+
+    public void removePropertyChangeListener(PropertyChangeListener listener) {
+        pcs.removePropertyChangeListener(listener);
+    }
+
+    public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) {
+        pcs.removePropertyChangeListener(propertyName, listener);
+    }
+
+    protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
+        pcs.firePropertyChange(propertyName, oldValue, newValue);
+    }
+}

Modified: trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/JRSTView.jaxx
===================================================================
--- trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/JRSTView.jaxx	2012-06-11 15:57:48 UTC (rev 712)
+++ trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/JRSTView.jaxx	2012-06-12 16:19:42 UTC (rev 713)
@@ -1,4 +1,6 @@
-<JDialog title='JRST' resizable='true' modal='true' visible='false' layout='{new BorderLayout()}'>
+<JDialog title='JRST' resizable='true' modal='true' visible='false'
+         defaultCloseOperation='{JDialog.DO_NOTHING_ON_CLOSE}'
+         onWindowClosing='handler.cancel()'>
 
   <import>
     javax.swing.BoxLayout
@@ -9,6 +11,12 @@
     org.nuiton.util.Resource
   </import>
 
+  <JRSTViewHandler id='handler' constructorParams='this'/>
+
+  <DefaultComboBoxModel id='comboBoxModel' constructorParams='handler.getFormats()'/>
+
+  <JRSTCommandModel id='model'/>
+
   <script><![CDATA[
 
     protected void $afterCompleteSetup() {
@@ -16,10 +24,6 @@
     }
 
   ]]></script>
-
-  <JRSTViewHandler id='handler' constructorParams='this'/>
-  <DefaultComboBoxModel id='comboBoxModel' constructorParams='handler.setFormats(JRST.PATTERN_TYPE)'/>
-
   <Table>
     <row>
       <cell columns='3'>
@@ -31,11 +35,14 @@
         <JLabel text='Open'/>
       </cell>
       <cell>
-        <JTextField id='openText' columns='31'/>
+        <JTextField id='openLocationText'
+                    text='model.getOpenLocationText()'
+                    onKeyReleased='model.setOpenLocationText(model.getOpenLocationText())'
+                    columns='31'/>
       </cell>
       <cell>
         <JButton id ='boutonOpenLocation'
-                 onActionPerformed='handler.openOpenLocation()'
+                 onActionPerformed='handler.doOpenLocation()'
                  preferredSize='{new Dimension(30,30)}'
                  constructorParams='Resource.getIcon("icone/open.png")'/>
       </cell>
@@ -45,11 +52,14 @@
         <JLabel text='saveAs'/>
       </cell>
       <cell>
-        <JTextField id='saveText' columns='31'/>
+        <JTextField id='saveLocationText'
+                    text='model.getSaveLocationText()'
+                    onKeyReleased='model.setSaveLocationText(model.getSaveLocationText())'
+                    columns='31'/>
       </cell>
       <cell>
         <JButton id ='boutonSaveLocation'
-                 onActionPerformed='handler.openSaveLocation()'
+                 onActionPerformed='handler.doOpenSaveLocation()'
                  preferredSize='{new Dimension(30,30)}'
                  constructorParams='Resource.getIcon("icone/open.png")'/>
       </cell>
@@ -59,53 +69,57 @@
       <cell>
         <JRadioButton id='format'
                       text='Format : '
-                      selected='true'
-                      onActionPerformed='handler.formatEnable()'/>
+                      selected='{formatEnabled}'
+                      onActionPerformed='handler.enableFormatList()'/>
       </cell>
       <cell columns='2'>
-        <JComboBox id='formatList' constructorParams='comboBoxModel'/>
+        <JComboBox id='formatList' model='{comboBoxModel}'/>
       </cell>
     </row>
 
     <row>
+      <cell>
+        <JRadioButton id='xslRadio'
+                      text='externalXSL'
+                      onActionPerformed='handler.enableXslList()'/>
+      </cell>
+      <cell columns='2'>
+        <JPanel id='xslListPanel' layout='{new BoxLayout(xslListPanel, BoxLayout.Y_AXIS)}'/>
+      </cell>
+    </row>
+    <row>
       <cell columns='3'>
-        <JPanel id='xslPanel' layout='{new BoxLayout(xslPanel, BoxLayout.Y_AXIS)}'>
-          <JPanel id='externalXSLPanel'>
-            <JRadioButton id='xslRadio' text='externalXSL'/>
-            <JTextField id='xslText' columns='30' enabled='false'/>
-            <JButton id='boutonXslLocation'
-                     preferredSize='{new Dimension(30, 30)}'
-                     constructorParams='Resource.getIcon("icone/open.png")'
-                     onActionPerformed='handler.openXslLocation((JButton)event.getSource())'
-                     enabled='false'/>
-          </JPanel>
-          <JPanel id='addXslPanel'>
-            <JButton id='addXslButton'
-                     constructorParams='Resource.getIcon("icone/more.gif")'
-                     preferredSize='{new Dimension(20, 20)}'
-                     onActionPerformed='handler.addXslLocation((JButton)event.getSource())'/>
-          </JPanel>
+        <JPanel id='addXslPanel'>
+          <JButton id='addXslButton'
+                   constructorParams='Resource.getIcon("icone/more.gif")'
+                   preferredSize='{new Dimension(20, 20)}'
+                   onActionPerformed='handler.addXslLocation()'/>
         </JPanel>
       </cell>
     </row>
 
-
-
     <row>
       <cell columns='3'>
-        <JCheckBox id='simpleModeChechBox' text='Simple mode'
-                   onActionPerformed='handler.setMode()'/>
+        <JCheckBox id='simpleModeChechBox'
+                   text='Simple mode'
+                   selected='{simpleMode}'
+                   onActionPerformed='setSimpleMode(simpleModeChechBox.isSelected())'/>
       </cell>
     </row>
 
     <row>
-      <cell/>
-      <cell>
-        <JButton id='boutonAnnuler' text='Cancel' onActionPerformed='handler.annuler()'/>
+      <cell columns='3'>
+        <Table>
+          <row>
+            <cell>
+              <JButton id='boutonAnnuler' text='Cancel' onActionPerformed='handler.cancel()'/>
+            </cell>
+            <cell>
+              <JButton id='boutonConvertir' text='Convert' onActionPerformed='handler.convert()'/>
+            </cell>
+          </row>
+        </Table>
       </cell>
-      <cell>
-        <JButton id='boutonConvertir' text='Convert' onActionPerformed='handler.convert()'/>
-      </cell>
     </row>
 
 

Modified: trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/JRSTViewHandler.java
===================================================================
--- trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/JRSTViewHandler.java	2012-06-11 15:57:48 UTC (rev 712)
+++ trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/JRSTViewHandler.java	2012-06-12 16:19:42 UTC (rev 713)
@@ -1,13 +1,15 @@
 package org.nuiton.jrst.jaxxUI;
 
-import org.nuiton.util.Resource;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import java.awt.Color;
+import java.awt.Component;
 import java.io.File;
-import java.util.LinkedList;
+import javax.swing.ButtonGroup;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import org.nuiton.jrst.JRST;
 
 import static org.nuiton.i18n.I18n._;
 
@@ -18,142 +20,75 @@
  */
 public class JRSTViewHandler {
 
-
-
-    private String[] listFormats;
-
-    private boolean ecrase;
-    private boolean simpleMode;
-    private String[] commande;
-
-    protected LinkedList<JTextField> textFieldList;
-    protected LinkedList<JButton>ListXslBoutonLocation;
-
     protected JRSTView jrstView;
 
-    protected JRSTViewHandler(JRSTView jrstView) {
+    public JRSTViewHandler(JRSTView jrstView) {
         this.jrstView = jrstView;
     }
 
     public void init() {
         ButtonGroup group = new ButtonGroup();
-        group.add(getXslRadio());
-    }
+        group.add(jrstView.getXslRadio());
+        group.add(jrstView.getFormat());
 
-    private JRadioButton getXslRadio() {
-        JRadioButton xslRadio = jrstView.getXslRadio();
-        if (xslRadio == null) {
-            xslRadio = new JRadioButton(_("externalXSL"));
-        }
-        return xslRadio;
+        XslPanel xslPanel = new XslPanel();
+        xslPanel.setPanelNumber(jrstView.getModel().getPanelNumber());
+        jrstView.getModel().incrementPanelNumber();
+        jrstView.getXslListPanel().add(xslPanel);
     }
 
-    protected void openOpenLocation() {
+    public void doOpenLocation() {
         JFileChooser fc = new JFileChooser(System.getProperty("user.home"));
         fc.showOpenDialog(jrstView);
         File file = fc.getSelectedFile();
         if (file != null) {
-            getOpenText().setText(file.getAbsolutePath());
+            jrstView.getOpenText().setText(file.getAbsolutePath());
         }
     }
 
-    private JTextField getOpenText() {
-        JTextField openText = jrstView.getOpenText();
-        if (openText == null) {
-            openText = new JTextField();
-            openText.setColumns(31);
-        }
-        return openText;
-    }
-
-    protected void openSaveLocation() {
+    public void doOpenSaveLocation() {
         JFileChooser fc = new JFileChooser(System.getProperty("user.home"));
         fc.showSaveDialog(jrstView);
         File file = fc.getSelectedFile();
         if (file != null) {
+            JTextField saveText = jrstView.getSaveText();
             if (file.exists()) {
                 int choix = askEcraser();
                 if (choix == JOptionPane.YES_OPTION) {
-                    ecrase = true;
-                    getSaveText().setText(file.getAbsolutePath());
+                    saveText.setText(file.getAbsolutePath());
                 } else if (choix == JOptionPane.NO_OPTION)
-                    openSaveLocation();
+                    doOpenSaveLocation();
             } else
-                getSaveText().setText(file.getAbsolutePath());
+                saveText.setText(file.getAbsolutePath());
         }
     }
 
-    protected void formatEnable() {
-        jrstView.getFormatList().setEnabled(jrstView.getFormat().isEnabled());
-        jrstView.getXslText().setEnabled(!jrstView.getXslText().isEnabled());
-        jrstView.getBoutonXslLocation().setEnabled(!jrstView.getBoutonXslLocation().isEnabled());
-    }
-
     public int askEcraser() {
         return JOptionPane.showConfirmDialog(jrstView, _("overwriteGraph?"));
     }
 
-    private JTextField getSaveText() {
-        JTextField saveText = jrstView.getSaveText();
-        if (saveText ==  null) {
-            saveText = new JTextField();
-            saveText.setColumns(31);
-        }
-        return saveText;
+    public String[] getFormats() {
+        String[] formats = JRST.PATTERN_TYPE.split("\\|");
+        return formats;
     }
 
-    protected JComboBox getFormatList() {
-        return jrstView.formatList;
-    }
-
-    public String[] setFormats(String formats) {
-        listFormats = formats.split("\\|");
-        return listFormats;
-    }
-
-    protected void setMode() {
-        simpleMode = !simpleMode;
-    }
-
-    protected void annuler() {
+    public void cancel() {
         System.exit(0);
     }
 
-    public String[] getCmd() {
-        return commande;
-    }
+    public void addXslLocation() {
+        XslPanel xslPanel = new XslPanel();
+        xslPanel.setPanelNumber(jrstView.getModel().getPanelNumber());
+        jrstView.getModel().incrementPanelNumber();
+        jrstView.getXslListPanel().add(xslPanel);
 
-    public void addXslLocation(JButton button) {
-        JPanel panel = (JPanel)button.getParent();
-        panel = new JPanel(new BoxLayout(panel, BoxLayout.Y_AXIS));
-
-        JTextField xslText = new JTextField();
-        xslText.setColumns(30);
-        xslText.setEnabled(false);
-        JButton boutonXslLocation = new JButton(Resource.getIcon("icone/open.png"));
-        boutonXslLocation.setPreferredSize(new Dimension(30, 30));
-        boutonXslLocation.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                //openXslLocation((JButton) e.getSource());
-            }
-        });
-        boutonXslLocation.setEnabled(false);
-
-        panel.add(xslText);
-        panel.add(boutonXslLocation);
-
-        JPanel panel2 = new JPanel(new BoxLayout(panel, BoxLayout.Y_AXIS));
-        JButton addXslButton = new JButton(Resource.getIcon("icone/more.gif"));
-        addXslButton.setPreferredSize(new Dimension(20, 20));
-        addXslButton.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent event) {
-                addXslLocation((JButton) event.getSource());
-            }
-        });
-        panel2.add(addXslButton);
+        if (!jrstView.getFormat().isSelected()) {
+            enableXslList();
+        }
+        jrstView.pack();
     }
 
-    private JLabel getErrorLabel() {
+    public JLabel getErrorLabel() {
         JLabel errorLbl = jrstView.getErrorLbl();
         if (errorLbl == null) {
             errorLbl = new JLabel("");
@@ -161,63 +96,33 @@
         return errorLbl;
     }
 
-    protected void openXslLocation(JButton b) {
-        JFileChooser fc = new JFileChooser(System.getProperty("user.home"));
-        fc.showOpenDialog(jrstView);
-        File file = fc.getSelectedFile();
-        if (file != null) {
-            int i = 0;
-            for (JButton btmp : ListXslBoutonLocation) {
-                if (btmp == b) {
-                    textFieldList.get(i).setText(file.getAbsolutePath());
-                }
+    public void enableFormatList() {
+        jrstView.getFormatList().setEnabled(true);
+        for (int i = 0; i <jrstView.getXslListPanel().getComponentCount(); i++ ) {
+            JPanel panel = (JPanel)jrstView.getXslListPanel().getComponent(i);
+            for(Component c : panel.getComponents()) {
+                c.setEnabled(false);
+            }
+        }
+    }
 
-                i++;
+    public void enableXslList() {
+        jrstView.getFormatList().setEnabled(false);
+        for (int i = 0; i <jrstView.getXslListPanel().getComponentCount(); i++ ) {
+            JPanel panel = (JPanel)jrstView.getXslListPanel().getComponent(i);
+            for(Component c : panel.getComponents()) {
+                c.setEnabled(true);
             }
         }
     }
 
-    protected void convert() {
-        boolean exit = false;
-        if (getOpenText().getText().equals("")) {
-            getErrorLabel().setText(_("openEmpty?"));
-            getErrorLabel().setForeground(Color.RED);
+    public void convert() {
+        if (jrstView.getOpenText().getText().equals("")) {
+            jrstView.getHandler().getErrorLabel().setText(_("openEmpty?"));
+            jrstView.getHandler().getErrorLabel().setForeground(Color.RED);
             jrstView.pack();
         } else {
-            if (!ecrase) {
-                File file = new File(getSaveText().getText());
-                if (file.exists()) {
-                    int choix = askEcraser();
-                    if (choix == JOptionPane.YES_OPTION)
-                        ecrase = true;
-                    else if (choix == JOptionPane.NO_OPTION)
-                        exit = true;
-                }
-            }
-            if (!exit) {
-                String cmd = "";
-                if (ecrase)
-                    cmd += "--force ";
-                if (simpleMode) {
-                    cmd += "--simple ";
-                }
-                if (jrstView.getFormat().isSelected())
-                    cmd += "-t " + getFormatList().getSelectedItem();
-                else {
-                    cmd += "-x ";
-                    for (JTextField t : textFieldList) {
-                        if (!t.getText().equals(""))
-                            cmd += t.getText() + ",";
-                    }
-                    cmd = cmd.substring(0, cmd.length() - 1);
-                }
-                if (getSaveText().getText().length() > 0)
-                    cmd += " -o " + getSaveText().getText();
-                cmd += " " + getOpenText().getText() + " ";
-                commande = cmd.trim().split(" ");
-                jrstView.dispose();
-            }
-
+            jrstView.setVisible(false);
         }
     }
 }

Added: trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/XslPanel.jaxx
===================================================================
--- trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/XslPanel.jaxx	                        (rev 0)
+++ trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/XslPanel.jaxx	2012-06-12 16:19:42 UTC (rev 713)
@@ -0,0 +1,26 @@
+<Table id='xslListPanel'>
+  <import>
+    java.awt.Dimension
+    org.nuiton.util.Resource
+  </import>
+
+  <XslPanelHandler id='handler' constructorParams='this'/>
+  <Integer id='panelNumber' javaBean='null'/>
+
+  <row>
+    <cell>
+      <JTextField id='xslLocationText'
+                  columns='30'
+                  enabled='false'
+                  text='model.getElementXslList(panelNumber)'
+                  onKeyReleased='model.setElementXslList(panelNumber, model.getElementXslList(panelNumber))'/>
+    </cell>
+    <cell>
+      <JButton id='boutonXslLocation'
+               enabled='false'
+               preferredSize='{new Dimension(30, 30)}'
+               constructorParams='Resource.getIcon("icone/open.png")'
+               onActionPerformed='handler.openXslLocation()'/>
+    </cell>
+  </row>
+</Table>
\ No newline at end of file

Added: trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/XslPanelHandler.java
===================================================================
--- trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/XslPanelHandler.java	                        (rev 0)
+++ trunk/jrst/src/main/java/org/nuiton/jrst/jaxxUI/XslPanelHandler.java	2012-06-12 16:19:42 UTC (rev 713)
@@ -0,0 +1,29 @@
+package org.nuiton.jrst.jaxxUI;
+
+import java.io.File;
+import javax.swing.JFileChooser;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: jpages
+ * Date: 12/06/12
+ * Time: 11:35
+ * To change this template use File | Settings | File Templates.
+ */
+public class XslPanelHandler {
+
+    XslPanel xslPanel;
+
+    public XslPanelHandler(XslPanel xslPanel) {
+        this.xslPanel = xslPanel;
+    }
+
+    public void openXslLocation() {
+        JFileChooser fc = new JFileChooser(System.getProperty("user.home"));
+        fc.showOpenDialog(xslPanel);
+        File file = fc.getSelectedFile();
+        if (file != null) {
+            xslPanel.getXslText().setText(file.getAbsolutePath());
+        }
+    }
+}

Modified: trunk/jrst/src/main/resources/log4j.properties
===================================================================
--- trunk/jrst/src/main/resources/log4j.properties	2012-06-11 15:57:48 UTC (rev 712)
+++ trunk/jrst/src/main/resources/log4j.properties	2012-06-12 16:19:42 UTC (rev 713)
@@ -33,3 +33,4 @@
 # package level
 log4j.logger.org.nuiton.jrst=INFO
 log4j.logger.org.nuiton.jrst.JRST=DEBUG
+log4j.logger.jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJavaFile=DEBUG

    

[Jrst-commits] r713 - in trunk/jrst/src/main: java/org/nuiton/jrst java/org/nuiton/jrst/jaxxUI resources

jpages＠users.nuiton.org