Revision 953

View differences:

org.gvsig.scripting/trunk/org.gvsig.scripting/org.gvsig.scripting.swing/org.gvsig.scripting.swing.impl/src/main/java/org/gvsig/scripting/swing/impl/DefaultJScriptingLauncher.java
51 51
        pestana = new JTabbedPane();
52 52
        for (ScriptingFolder folder : folders) {
53 53
            DefaultJScriptingBrowser browser = new DefaultJScriptingBrowser(uimanager, folder);
54
            browser.addDefaultActionListener(this);
54
            browser.addActionListener(this);
55 55
            pestana.addTab(uimanager.getTranslation(folder.getName()), browser);
56 56
        }
57 57
        this.setLayout(new BorderLayout());
org.gvsig.scripting/trunk/org.gvsig.scripting/org.gvsig.scripting.swing/org.gvsig.scripting.swing.impl/src/main/java/org/gvsig/scripting/swing/impl/DefaultJScriptingBrowser.java
39 39
import org.gvsig.scripting.ScriptingManager;
40 40
import org.gvsig.scripting.ScriptingUnit;
41 41
import org.gvsig.scripting.swing.api.JScriptingBrowser;
42
import static org.gvsig.scripting.swing.api.JScriptingBrowser.DEFAULT_ACTION;
43
import static org.gvsig.scripting.swing.api.JScriptingBrowser.SELECTION_ACTION;
42 44
import org.gvsig.scripting.swing.api.ScriptingUIManager;
45
import org.gvsig.tools.swing.api.ActionListenerSupport;
46
import org.gvsig.tools.swing.api.ToolsSwingLocator;
43 47
import org.slf4j.LoggerFactory;
44 48
import org.slf4j.Logger;
45 49

  
......
53 57
    protected TreeModel treeModel;
54 58
    protected JTree tree;
55 59
    protected ScriptingFolder root;
56
    protected ActionListener defaultActionlistener = null;
57
    protected ActionListener selectionActionlistener = null;
60
    protected ActionListenerSupport actionlisteners = null;
58 61
    private final boolean foldersOnly;
59 62

  
60 63
    public static class DefaultBrowserActionEvent extends ActionEvent implements BrowserActionEvent {
......
198 201
    public DefaultJScriptingBrowser(ScriptingUIManager uimanager,
199 202
            ScriptingFolder root, boolean foldersOnly) {
200 203
        super(new GridLayout(1, 2));
204
        this.actionlisteners = ToolsSwingLocator.getToolsSwingManager().createActionListenerSupport();
201 205
        this.foldersOnly = foldersOnly;
202 206
        this.uimanager = uimanager;
203 207
        this.manager = uimanager.getManager();
......
237 241
    }
238 242

  
239 243
    @Override
240
    public void addDefaultActionListener(ActionListener actionlistener) {
241
        this.defaultActionlistener = actionlistener;
244
    public void addActionListener(ActionListener actionlistener) {
245
        this.actionlisteners.addActionListener(actionlistener);
242 246
    }
243 247

  
244
    @Override
245
    public void addSelectionActionListener(ActionListener actionlistener) {
246
        this.selectionActionlistener = actionlistener;
247
    }
248

  
249 248
    private void makeUI() {
250 249
        if (this.foldersOnly) {
251 250
            treeModel = new ScriptingFolderTreeModelFoldersOnly(root);
......
263 262
        tree.addTreeSelectionListener(new TreeSelectionListener() {
264 263
            @Override
265 264
            public void valueChanged(TreeSelectionEvent e) {
266
                if (selectionActionlistener != null) {
267
                    JComponent tree = (JComponent) e.getSource();
268
                    ActionEvent event = new DefaultBrowserActionEvent(
269
                            tree.getParent(),
270
                            SELECTION_ACTION,
271
                            "select",
272
                            null
273
                    );
274
                    selectionActionlistener.actionPerformed(event);
265
                JTree tree = (JTree) e.getSource();
266
                if (!tree.isSelectionEmpty()) {
267
                    fireSelectAction(tree.getSelectionPath());
275 268
                }
276 269
            }
277 270
        });
......
346 339

  
347 340
    private void fireDefaultAction(TreePath path) {
348 341
        ScriptingUnit unit = (ScriptingUnit) path.getLastPathComponent();
349
        //if (unit instanceof ScriptingBaseScript) {
350
            if (this.defaultActionlistener != null) {
351
                ActionEvent event = new DefaultBrowserActionEvent(
352
                        this,
353
                        DEFAULT_ACTION,
354
                        "default",
355
                        unit
356
                );
357
                this.defaultActionlistener.actionPerformed(event);
358
            }
359
        //}
342
        ActionEvent ae = new DefaultBrowserActionEvent(
343
                this,
344
                DEFAULT_ACTION,
345
                "default",
346
                unit
347
        );
348
        this.actionlisteners.fireActionEvent(ae);
360 349
    }
361 350

  
351
    private void fireSelectAction(TreePath path) {
352
        ScriptingUnit unit = (ScriptingUnit) path.getLastPathComponent();
353
        ActionEvent ae = new DefaultJScriptingBrowser.DefaultBrowserActionEvent(
354
                this,
355
                SELECTION_ACTION,
356
                "select",
357
                unit
358
        );
359
        this.actionlisteners.fireActionEvent(ae);
360
    }
361

  
362 362
    private class EnterAction extends AbstractAction {
363 363
        private static final long serialVersionUID = -3673546098243190397L;
364 364

  
org.gvsig.scripting/trunk/org.gvsig.scripting/org.gvsig.scripting.swing/org.gvsig.scripting.swing.impl/src/main/java/org/gvsig/scripting/swing/impl/composer/editors/AbstractEditor.java
1
package org.gvsig.scripting.swing.impl.composer.editors;
2

  
3
import java.beans.PropertyChangeListener;
4
import org.gvsig.scripting.ScriptingUnit;
5
import org.gvsig.scripting.swing.api.JEditor;
6

  
7
public abstract class AbstractEditor implements JEditor {
8

  
9
    private ScriptingUnit unit;
10
    
11
    protected AbstractEditor() {
12
        
13
    }
14
    
15
    @Override
16
    public ScriptingUnit getUnit() {
17
        return this.unit;
18
    }
19

  
20
    @Override
21
    public void set(ScriptingUnit unit) {
22
        this.unit = unit;
23
    }
24

  
25
    @Override
26
    public void addChangeListener(PropertyChangeListener listener) {
27
    }
28

  
29
    @Override
30
    public void save() {
31
    }
32

  
33
    @Override
34
    public boolean isModified() {
35
        return false;
36
    }
37

  
38
    @Override
39
    public void fetch(ScriptingUnit unit) {
40
    }
41

  
42
}
org.gvsig.scripting/trunk/org.gvsig.scripting/org.gvsig.scripting.swing/org.gvsig.scripting.swing.impl/src/main/java/org/gvsig/scripting/swing/impl/composer/JNewScriptPanel.java
15 15
import org.gvsig.scripting.ScriptingFolder;
16 16
import org.gvsig.scripting.ScriptingManager;
17 17
import org.gvsig.scripting.ScriptingUnit;
18
import org.gvsig.scripting.swing.api.JScriptingBrowser;
18 19
import org.gvsig.scripting.swing.api.ScriptingUIManager;
19 20
import org.gvsig.scripting.swing.impl.DefaultJScriptingBrowser;
20 21
import org.gvsig.scripting.swing.impl.DialogPanel;
......
63 64
        jbrowser.setPreferredSize(new Dimension(250, 100));
64 65
        saveToPanel.setLayout(new BorderLayout());
65 66
        saveToPanel.add(jbrowser);
66
        jbrowser.addSelectionActionListener(new ActionListener() {
67
        jbrowser.addActionListener(new ActionListener() {
67 68
            @Override
68 69
            public void actionPerformed(ActionEvent arg0) {
69
                doFolderSelection();
70
                if( arg0.getID() == JScriptingBrowser.SELECTION_ACTION ) {
71
                    doFolderSelection();
72
                }
70 73
            }
71 74
        });
72 75
        jbrowser.setSelectionPath(this.model.getSelectionPath());
org.gvsig.scripting/trunk/org.gvsig.scripting/org.gvsig.scripting.swing/org.gvsig.scripting.swing.impl/src/main/java/org/gvsig/scripting/swing/impl/composer/JMoveScriptPanel.java
19 19
import org.gvsig.scripting.ScriptingFolder;
20 20
import org.gvsig.scripting.ScriptingManager;
21 21
import org.gvsig.scripting.ScriptingUnit;
22
import org.gvsig.scripting.swing.api.JScriptingBrowser;
22 23
import org.gvsig.scripting.swing.api.ScriptingUIManager;
23 24
import org.gvsig.scripting.swing.impl.DefaultJScriptingBrowser;
24 25
import org.gvsig.scripting.swing.impl.DialogPanel;
......
75 76
		gbc.gridwidth = 2;
76 77
		DefaultJScriptingBrowser jbrowser = new DefaultJScriptingBrowser(this.uimanager,this.manager.getUserFolder(),true);
77 78
		jbrowser.setPreferredSize(new Dimension(250,100));
78
		jbrowser.addSelectionActionListener(this);
79
		jbrowser.addActionListener(this);
79 80
		add(jbrowser,gbc);
80 81
		
81 82
	}
......
142 143
	}
143 144

  
144 145
	public void actionPerformed(ActionEvent arg0) {
145
		JViewport jView = (JViewport)arg0.getSource();
146
		JScrollPane jScroll = (JScrollPane)jView.getParent();
147
		DefaultJScriptingBrowser jBrowser = (DefaultJScriptingBrowser)jScroll.getParent();
148
		if(jBrowser.getSelectedNode() instanceof ScriptingFolder){
149
			ScriptingFolder selectedFolder = (ScriptingFolder)jBrowser.getSelectedNode();
150
			moveTo.setText(selectedFolder.getFile().getAbsolutePath());
151
		}
146
        if( arg0.getID() == JScriptingBrowser.SELECTION_ACTION ) {
147
            JViewport jView = (JViewport)arg0.getSource();
148
            JScrollPane jScroll = (JScrollPane)jView.getParent();
149
            DefaultJScriptingBrowser jBrowser = (DefaultJScriptingBrowser)jScroll.getParent();
150
            if(jBrowser.getSelectedNode() instanceof ScriptingFolder){
151
                ScriptingFolder selectedFolder = (ScriptingFolder)jBrowser.getSelectedNode();
152
                moveTo.setText(selectedFolder.getFile().getAbsolutePath());
153
            }
154
        }
152 155
	}
153 156
	public JComponent getJComponent() {
154 157
		return this;
org.gvsig.scripting/trunk/org.gvsig.scripting/org.gvsig.scripting.swing/org.gvsig.scripting.swing.api/src/main/java/org/gvsig/scripting/swing/api/JScriptingBrowser.java
49 49
    
50 50
    public void setSelectionPath(TreePath path);
51 51
    
52
    public void addDefaultActionListener(ActionListener listener);
53
    
54
    public void addSelectionActionListener(ActionListener listener);
52
    public void addActionListener(ActionListener listener);
55 53
}

Also available in: Unified diff