Revision 47823

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.downloader/org.gvsig.downloader.lib/org.gvsig.downloader.lib.impl/src/main/java/org/gvsig/downloader/lib/impl/types/httpbasic/LogginDialog.java
1
/*
2
 * gvSIG. Desktop Geographic Information System.
3
 * 
4
 * Copyright (C) 2007-2020 gvSIG Association.
5
 * 
6
 * This program is free software; you can redistribute it and/or
7
 * modify it under the terms of the GNU General Public License
8
 * as published by the Free Software Foundation; either version 3
9
 * of the License, or (at your option) any later version.
10
 * 
11
 * This program is distributed in the hope that it will be useful,
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
 * GNU General Public License for more details.
15
 * 
16
 * You should have received a copy of the GNU General Public License 
17
 * along with this program. If not, see <https://www.gnu.org/licenses/>. 
18
 * 
19
 * For any additional information, do not hesitate to contact us
20
 * at info AT gvsig.com, or visit our website www.gvsig.com.
21
 */
22

  
23
package org.gvsig.downloader.lib.impl.types.httpbasic;
24

  
25
import java.awt.event.ActionEvent;
26
import java.awt.event.ActionListener;
27
import javax.swing.SwingUtilities;
28
import org.apache.commons.lang3.StringUtils;
29
import org.gvsig.tools.ToolsLocator;
30
import org.gvsig.tools.i18n.I18nManager;
31
import org.gvsig.tools.swing.api.ActionListenerSupport;
32
import org.gvsig.tools.swing.api.ToolsSwingLocator;
33
import org.gvsig.tools.swing.api.ToolsSwingManager;
34
import org.gvsig.tools.swing.api.ToolsSwingUtils;
35
import org.gvsig.tools.swing.api.windowmanager.Dialog;
36
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
37
import org.gvsig.tools.swing.api.windowmanager.WindowManager_v2;
38

  
39
/**
40
 *
41
 * @author gvSIG Team
42
 */
43
@SuppressWarnings("UseSpecificCatch")
44
public class LogginDialog
45
        extends LoginDialogView 
46
        implements ActionListenerSupport
47
    {
48
    
49
    @SuppressWarnings("FieldMayBeFinal")
50
    private String userId;
51
    @SuppressWarnings("FieldMayBeFinal")
52
    private String password;
53
    
54
    private final ActionListenerSupport actionListenerSupport;
55
    
56
    public LogginDialog(String userId, String password) {
57
        this.password = null;
58
        this.userId = null;
59
        this.actionListenerSupport = ToolsSwingLocator.getToolsSwingManager().createActionListenerSupport();
60
        this.initComponents();
61
        this.txtUser.setText(userId);
62
        this.txtPassword.setText(password);
63
    }
64

  
65
    public LogginDialog() {
66
        this(null, null);
67
    }
68
    
69
    private void translate() {
70
        ToolsSwingManager swingManager = ToolsSwingLocator.getToolsSwingManager();
71
        swingManager.translate(this.lblUser);
72
        swingManager.translate(this.lblPassword);
73
        swingManager.translate(this.lblDescription, true);
74
    }
75

  
76
    private void initComponents() {
77
        ToolsSwingManager toolsSwingManager = ToolsSwingLocator.getToolsSwingManager();
78
        
79
        this.translate();
80
        
81
        toolsSwingManager.addClearButton(this.txtPassword);
82
        toolsSwingManager.addClearButton(this.txtUser);
83
        toolsSwingManager.setDefaultPopupMenu(this.txtPassword);
84
        toolsSwingManager.setDefaultPopupMenu(this.txtUser);
85
        
86
        ToolsSwingUtils.ensureRowsCols(this, 6, 55, 10, 70);
87
    }
88
    
89
    
90
    public boolean showDialog() {
91
        if( !SwingUtilities.isEventDispatchThread() ) {
92
            try {
93
                SwingUtilities.invokeAndWait(() -> {
94
                    showDialog();
95
                });
96
                return false;
97
            } catch (Exception ex) {
98
                return false;
99
            }
100
        }
101
                
102
        I18nManager i18n = ToolsLocator.getI18nManager();
103
        WindowManager_v2 windowManager = (WindowManager_v2) ToolsSwingLocator.getWindowManager();
104
        Dialog dialog = windowManager.createDialog(
105
                this,
106
                i18n.getTranslation("_User_login"),
107
                null, 
108
                WindowManager_v2.BUTTONS_OK_CANCEL
109
        );
110
        dialog.addActionListener((ActionEvent e) -> {
111
            if( dialog.getAction()==WindowManager_v2.BUTTON_OK) {
112
                this.userId = StringUtils.defaultIfBlank(this.txtUser.getText(), null);
113
                this.password = StringUtils.defaultIfBlank(String.valueOf(this.txtPassword.getPassword()), null);
114
                actionListenerSupport.fireActionEvent(e);
115
            }
116
        });
117
        dialog.show(WindowManager.MODE.DIALOG);
118
        return dialog.getAction()==WindowManager_v2.BUTTON_OK;
119
    }
120

  
121
    public String getUserId() {
122
        return this.userId;
123
    }
124

  
125
    public String getPassword() {
126
        return this.password;
127
    }
128

  
129
    @Override
130
    public void addActionListener(ActionListener listener) {
131
        this.actionListenerSupport.addActionListener(listener);
132
    }
133

  
134
    @Override
135
    public ActionListener[] getActionListeners() {
136
        return this.actionListenerSupport.getActionListeners();
137
    }
138

  
139
    @Override
140
    public void removeActionListener(ActionListener listener) {
141
        this.actionListenerSupport.removeActionListener(listener);
142
    }
143

  
144
    @Override
145
    public void removeAllActionListener() {
146
        this.actionListenerSupport.removeAllActionListener();
147
    }
148

  
149
    @Override
150
    public void fireActionEvent(ActionEvent event) {
151
        this.actionListenerSupport.fireActionEvent(event);
152
    }
153

  
154
    @Override
155
    public boolean hasActionListeners() {
156
        return this.actionListenerSupport.hasActionListeners();
157
    }
158

  
159
}
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.downloader/org.gvsig.downloader.lib/org.gvsig.downloader.lib.impl/src/main/java/org/gvsig/downloader/lib/impl/types/httpbasic/LoginDialog.java
1
/*
2
 * gvSIG. Desktop Geographic Information System.
3
 * 
4
 * Copyright (C) 2007-2020 gvSIG Association.
5
 * 
6
 * This program is free software; you can redistribute it and/or
7
 * modify it under the terms of the GNU General Public License
8
 * as published by the Free Software Foundation; either version 3
9
 * of the License, or (at your option) any later version.
10
 * 
11
 * This program is distributed in the hope that it will be useful,
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
 * GNU General Public License for more details.
15
 * 
16
 * You should have received a copy of the GNU General Public License 
17
 * along with this program. If not, see <https://www.gnu.org/licenses/>. 
18
 * 
19
 * For any additional information, do not hesitate to contact us
20
 * at info AT gvsig.com, or visit our website www.gvsig.com.
21
 */
22

  
23
package org.gvsig.downloader.lib.impl.types.httpbasic;
24

  
25
import java.awt.event.ActionEvent;
26
import java.awt.event.ActionListener;
27
import javax.swing.SwingUtilities;
28
import org.apache.commons.lang3.StringUtils;
29
import org.gvsig.tools.ToolsLocator;
30
import org.gvsig.tools.i18n.I18nManager;
31
import org.gvsig.tools.swing.api.ActionListenerSupport;
32
import org.gvsig.tools.swing.api.ToolsSwingLocator;
33
import org.gvsig.tools.swing.api.ToolsSwingManager;
34
import org.gvsig.tools.swing.api.ToolsSwingUtils;
35
import org.gvsig.tools.swing.api.windowmanager.Dialog;
36
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
37
import org.gvsig.tools.swing.api.windowmanager.WindowManager_v2;
38

  
39
/**
40
 *
41
 * @author gvSIG Team
42
 */
43
@SuppressWarnings("UseSpecificCatch")
44
public class LoginDialog
45
        extends LoginDialogView 
46
        implements ActionListenerSupport
47
    {
48
    
49
    @SuppressWarnings("FieldMayBeFinal")
50
    private String userId;
51
    @SuppressWarnings("FieldMayBeFinal")
52
    private String password;
53
    
54
    private final ActionListenerSupport actionListenerSupport;
55
    
56
    public LoginDialog(String userId, String password) {
57
        this.password = null;
58
        this.userId = null;
59
        this.actionListenerSupport = ToolsSwingLocator.getToolsSwingManager().createActionListenerSupport();
60
        this.initComponents();
61
        this.txtUser.setText(userId);
62
        this.txtPassword.setText(password);
63
    }
64

  
65
    public LoginDialog() {
66
        this(null, null);
67
    }
68
    
69
    private void translate() {
70
        ToolsSwingManager swingManager = ToolsSwingLocator.getToolsSwingManager();
71
        swingManager.translate(this.lblUser);
72
        swingManager.translate(this.lblPassword);
73
        swingManager.translate(this.lblDescription, true);
74
    }
75

  
76
    private void initComponents() {
77
        ToolsSwingManager toolsSwingManager = ToolsSwingLocator.getToolsSwingManager();
78
        
79
        this.translate();
80
        
81
        toolsSwingManager.addClearButton(this.txtPassword);
82
        toolsSwingManager.addClearButton(this.txtUser);
83
        toolsSwingManager.setDefaultPopupMenu(this.txtPassword);
84
        toolsSwingManager.setDefaultPopupMenu(this.txtUser);
85
        
86
        ToolsSwingUtils.ensureRowsCols(this, 6, 55, 10, 70);
87
    }
88
    
89
    
90
    public boolean showDialog() {
91
        if( !SwingUtilities.isEventDispatchThread() ) {
92
            try {
93
                SwingUtilities.invokeAndWait(() -> {
94
                    showDialog();
95
                });
96
                return false;
97
            } catch (Exception ex) {
98
                return false;
99
            }
100
        }
101
                
102
        I18nManager i18n = ToolsLocator.getI18nManager();
103
        WindowManager_v2 windowManager = (WindowManager_v2) ToolsSwingLocator.getWindowManager();
104
        Dialog dialog = windowManager.createDialog(
105
                this,
106
                i18n.getTranslation("_User_login"),
107
                null, 
108
                WindowManager_v2.BUTTONS_OK_CANCEL
109
        );
110
        dialog.addActionListener((ActionEvent e) -> {
111
            if( dialog.getAction()==WindowManager_v2.BUTTON_OK) {
112
                this.userId = StringUtils.defaultIfBlank(this.txtUser.getText(), null);
113
                this.password = StringUtils.defaultIfBlank(String.valueOf(this.txtPassword.getPassword()), null);
114
                actionListenerSupport.fireActionEvent(e);
115
            }
116
        });
117
        dialog.show(WindowManager.MODE.DIALOG);
118
        return dialog.getAction()==WindowManager_v2.BUTTON_OK;
119
    }
120

  
121
    public String getUserId() {
122
        return this.userId;
123
    }
124

  
125
    public String getPassword() {
126
        return this.password;
127
    }
128

  
129
    @Override
130
    public void addActionListener(ActionListener listener) {
131
        this.actionListenerSupport.addActionListener(listener);
132
    }
133

  
134
    @Override
135
    public ActionListener[] getActionListeners() {
136
        return this.actionListenerSupport.getActionListeners();
137
    }
138

  
139
    @Override
140
    public void removeActionListener(ActionListener listener) {
141
        this.actionListenerSupport.removeActionListener(listener);
142
    }
143

  
144
    @Override
145
    public void removeAllActionListener() {
146
        this.actionListenerSupport.removeAllActionListener();
147
    }
148

  
149
    @Override
150
    public void fireActionEvent(ActionEvent event) {
151
        this.actionListenerSupport.fireActionEvent(event);
152
    }
153

  
154
    @Override
155
    public boolean hasActionListeners() {
156
        return this.actionListenerSupport.hasActionListeners();
157
    }
158

  
159
}
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.downloader/org.gvsig.downloader.lib/org.gvsig.downloader.lib.impl/src/main/java/org/gvsig/downloader/lib/impl/types/httpbasic/DownloaderHTTPBasicAuthenticationRequester.java
58 58
                return false;
59 59
            }
60 60
        }
61
        LogginDialog logginDialog = new LogginDialog();
61
        LoginDialog logginDialog = new LoginDialog();
62 62
        logginDialog.addActionListener((ActionEvent e) -> {
63 63
                credentials = new DownloaderHTTPBasicCredentials(
64 64
                        this.getConfig().getBaseUrl(),
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.downloader/org.gvsig.downloader.lib/org.gvsig.downloader.lib.impl/pom.xml
126 126
            <artifactId>tika-core</artifactId>
127 127
            <scope>compile</scope>
128 128
        </dependency>
129

  
129
    
130 130
        <dependency>
131
            <groupId>com.jgoodies</groupId>
132
            <artifactId>jgoodies-forms</artifactId>
133
            <scope>compile</scope>
134
        </dependency>
135
        <dependency>
136
            <groupId>org.apache.httpcomponents</groupId>
137
            <artifactId>httpclient</artifactId>
138
            <scope>compile</scope>
139
        </dependency>
140
        
141
    
142
        <dependency>
131 143
            <groupId>${tika.groupid}</groupId>
132 144
            <artifactId>tika-parsers-standard-package</artifactId>
133 145
            <scope>test</scope>
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.downloader/org.gvsig.downloader.swing/org.gvsig.downloader.swing.impl/src/main/java/org/gvsig/downloader/swing/impl/DownloaderSwingImplLibrary.java
25 25

  
26 26
import org.gvsig.downloader.swing.DownloaderSwingLibrary;
27 27
import org.gvsig.downloader.swing.DownloaderSwingLocator;
28
import org.gvsig.downloader.swing.impl.config.DownloaderConfigServicePanel;
28 29
import org.gvsig.tools.library.AbstractLibrary;
29 30
import org.gvsig.tools.library.LibraryException;
30 31

  
......
47 48

  
48 49
    @Override
49 50
    protected void doPostInitialize() throws LibraryException {
50
        registerIcons();
51
//        registerIcons();
52
        DownloaderConfigServicePanel.selfRegister();
51 53
    }
52 54

  
53 55
    
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.downloader/org.gvsig.downloader.swing/org.gvsig.downloader.swing.impl/src/main/java/org/gvsig/downloader/swing/impl/config/DownloaderConfigServicePanel.java
27 27
import org.gvsig.tools.swing.api.ListElement;
28 28
import org.gvsig.tools.swing.api.ToolsSwingLocator;
29 29
import org.gvsig.tools.swing.api.ToolsSwingManager;
30
import org.gvsig.tools.swing.api.ToolsSwingUtils;
30 31
import org.gvsig.tools.swing.api.threadsafedialogs.ThreadSafeDialogsManager;
31 32
import org.gvsig.tools.swing.icontheme.IconTheme;
32 33

  
......
229 230
        return this.changeListenerHelper.hasChangeListeners();
230 231
    }
231 232

  
233
    public static void selfRegister() {
234
        ToolsSwingUtils.registerIcons(DownloaderConfigServicePanel.class, 
235
                "/org/gvsig/downloader/swing/impl/images",
236
                "downloader",
237
                new String[] { "downloader", "downloader-auth-config" },
238
                new String[] { "downloader", "downloader-auth-test" }
239
        );
240
//        ToolsSwingUtils.registerGroupIconScreenshot(DownloaderConfigServicePanel.class, 
241
//                "downloader",
242
//                "/org/gvsig/downloader/swing/impl/screenshots/downloader.png"
243
//        );
244
    }
232 245
    
233 246
}
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.downloader/org.gvsig.downloader.swing/org.gvsig.downloader.swing.impl/src/main/java/org/gvsig/downloader/swing/impl/config/DownloaderConfigPanelImpl.java
5 5
import java.util.Collections;
6 6
import java.util.List;
7 7
import javax.swing.AbstractListModel;
8
import javax.swing.DefaultListModel;
8 9
import javax.swing.ImageIcon;
9 10
import javax.swing.JComponent;
10 11
import javax.swing.event.ChangeEvent;
......
160 161
    }
161 162

  
162 163

  
163
    private static class AutenticationTypesListModel extends AbstractListModel<DownloaderAuthenticationFactory> {
164

  
165
        private final List<DownloaderAuthenticationFactory> authenticationTypes;
166
        
167
        public AutenticationTypesListModel(DownloaderManager downloader) {
168
            if( downloader == null ) {
169
                this.authenticationTypes = Collections.EMPTY_LIST;
170
            } else {
171
                this.authenticationTypes = new ArrayList<>(downloader.getAuthenticationTypes());
172
            }
173
        }
174

  
175
        @Override
176
        public int getSize() {
177
            return this.authenticationTypes.size();
178
        }
179

  
180
        @Override
181
        public DownloaderAuthenticationFactory getElementAt(int index) {
182
            return this.authenticationTypes.get(index);
183
        }
184
    }
164
//    private static class AutenticationTypesListModel extends AbstractListModel<DownloaderAuthenticationFactory> {
165
//
166
//        private final List<DownloaderAuthenticationFactory> authenticationTypes;
167
//        
168
//        public AutenticationTypesListModel(DownloaderManager downloader) {
169
//            if( downloader == null ) {
170
//                this.authenticationTypes = Collections.EMPTY_LIST;
171
//            } else {
172
//                this.authenticationTypes = new ArrayList<>(downloader.getAuthenticationTypes());
173
//            }
174
//        }
175
//
176
//        @Override
177
//        public int getSize() {
178
//            return this.authenticationTypes.size();
179
//        }
180
//
181
//        @Override
182
//        public DownloaderAuthenticationFactory getElementAt(int index) {
183
//            return this.authenticationTypes.get(index);
184
//        }
185
//    }
185 186
    
186 187
    public DownloaderConfigPanelImpl() {
187 188
        
......
200 201
        
201 202
        this.tblAuthenticatedServices.setModel(new AuthenticatedServicesTableModel(downloader));
202 203
        this.tblCredentials.setModel(new CredentialsTableModel(downloader));
203
        this.lstAuthenticationTypes.setModel(new AutenticationTypesListModel(downloader));
204
        DefaultListModel<DownloaderAuthenticationFactory> authenticationTypesModel = new DefaultListModel<>();
205
        for (DownloaderAuthenticationFactory authType : downloader.getAuthenticationTypes()) {
206
            authenticationTypesModel.addElement(authType);
207
        }        
208
        this.lstAuthenticationTypes.setModel(authenticationTypesModel);
204 209
        
205 210
        this.btnAuthenticatedServicesAdd.addActionListener((ActionEvent e) -> {
206 211
            doAuthenticateServciceAdd();
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.downloader/org.gvsig.downloader.swing/org.gvsig.downloader.swing.impl/src/main/java/org/gvsig/downloader/swing/impl/config/DownloaderConfigServicePanelView.xml
24 24
    </at>
25 25
    <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
26 26
   </super>
27
   <at name="id">/home/jjdelcerro/datos/devel/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/downloader/DownloaderConfigServicePanelView.java.jfrm</at>
28
   <at name="path">datos/devel/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/downloader/DownloaderConfigServicePanelView.java.jfrm</at>
27
   <at name="id">/home/jjdelcerro/datos/devel/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.downloader/org.gvsig.downloader.swing/org.gvsig.downloader.swing.impl/src/main/java/org/gvsig/downloader/swing/impl/config/DownloaderConfigServicePanelView.xml</at>
28
   <at name="path">datos/devel/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.downloader/org.gvsig.downloader.swing/org.gvsig.downloader.swing.impl/src/main/java/org/gvsig/downloader/swing/impl/config/DownloaderConfigServicePanelView.xml</at>
29 29
   <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
30 30
   <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
31 31
   <at name="components">
......
75 75
             </object>
76 76
            </at>
77 77
            <at name="name">txtServiceURL</at>
78
            <at name="width">643</at>
78
            <at name="width">655</at>
79 79
            <at name="height">22</at>
80 80
           </object>
81 81
          </at>
......
101 101
         </at>
102 102
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
103 103
        </super>
104
        <at name="id">embedded.786625628</at>
104
        <at name="id">embedded.2073604001</at>
105 105
        <at name="rowspecs">CENTER:DEFAULT:NONE</at>
106 106
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
107 107
        <at name="components">
......
151 151
                  </object>
152 152
                 </at>
153 153
                 <at name="name">cboAuthenticationType</at>
154
                 <at name="width">578</at>
154
                 <at name="width">590</at>
155 155
                 <at name="items">
156 156
                  <object classname="com.jeta.forms.store.properties.ItemsProperty">
157 157
                   <at name="name">items</at>
......
217 217
                 <at name="icon">
218 218
                  <object classname="com.jeta.forms.store.properties.IconProperty">
219 219
                   <at name="embedded">false</at>
220
                   <at name="path">datos/devel/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/resources/org/gvsig/online/swing/impl/images/online-auth-config.png</at>
221
                   <at name="description">online-auth-config.png</at>
220
                   <at name="path">datos/devel/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.downloader/org.gvsig.downloader.swing/org.gvsig.downloader.swing.impl/src/main/resources/org/gvsig/downloader/swing/impl/images/downloader-auth-config.png</at>
221
                   <at name="description">downloader-auth-config.png</at>
222 222
                   <at name="width">16</at>
223 223
                   <at name="height">16</at>
224 224
                  </object>
......
285 285
                 <at name="icon">
286 286
                  <object classname="com.jeta.forms.store.properties.IconProperty">
287 287
                   <at name="embedded">false</at>
288
                   <at name="path">datos/devel/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/resources/org/gvsig/online/swing/impl/images/online-auth-test.png</at>
289
                   <at name="description">online-auth-test.png</at>
288
                   <at name="path">datos/devel/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.downloader/org.gvsig.downloader.swing/org.gvsig.downloader.swing.impl/src/main/resources/org/gvsig/downloader/swing/impl/images/downloader-auth-test.png</at>
289
                   <at name="description">downloader-auth-test.png</at>
290 290
                   <at name="width">16</at>
291 291
                   <at name="height">16</at>
292 292
                  </object>
......
318 318
              </at>
319 319
             </object>
320 320
            </at>
321
            <at name="name"></at>
321
            <at name="name"/>
322 322
            <at name="fill">
323 323
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
324 324
              <at name="name">fill</at>
......
428 428
             </object>
429 429
            </at>
430 430
            <at name="name">lblServiceURL</at>
431
            <at name="width">120</at>
431
            <at name="width">110</at>
432 432
            <at name="text">_Service_URL</at>
433 433
            <at name="fill">
434 434
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
488 488
             </object>
489 489
            </at>
490 490
            <at name="name">lblAuthenmticationType</at>
491
            <at name="width">120</at>
492
            <at name="text">_Authenmtication_type</at>
491
            <at name="width">110</at>
492
            <at name="text">_Authentication_type</at>
493 493
            <at name="fill">
494 494
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
495 495
              <at name="name">fill</at>
......
520 520
         </at>
521 521
        </object>
522 522
       </at>
523
       <at name="name"></at>
523
       <at name="name"/>
524 524
       <at name="fill">
525 525
        <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
526 526
         <at name="name">fill</at>
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.downloader/org.gvsig.downloader.swing/org.gvsig.downloader.swing.impl/src/main/java/org/gvsig/downloader/swing/impl/config/DownloaderConfigServicePanelView.java
130 130
      jpanel1.add(lblServiceURL,cc.xy(2,2));
131 131

  
132 132
      lblAuthenmticationType.setName("lblAuthenmticationType");
133
      lblAuthenmticationType.setText("_Authenmtication_type");
133
      lblAuthenmticationType.setText("_Authentication_type");
134 134
      jpanel1.add(lblAuthenmticationType,cc.xy(2,4));
135 135

  
136 136
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3,4,5 });
......
148 148
      jpanel1.add(cboAuthenticationType,cc.xy(1,1));
149 149

  
150 150
      btnAuthenticationConfig.setActionCommand("...");
151
      btnAuthenticationConfig.setIcon(loadImage("datos/devel/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/resources/org/gvsig/online/swing/impl/images/online-auth-config.png"));
151
      btnAuthenticationConfig.setIcon(loadImage("datos/devel/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.downloader/org.gvsig.downloader.swing/org.gvsig.downloader.swing.impl/src/main/resources/org/gvsig/downloader/swing/impl/images/downloader-auth-config.png"));
152 152
      btnAuthenticationConfig.setName("btnAuthenticationConfig");
153 153
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
154 154
      btnAuthenticationConfig.setBorder(emptyborder1);
155 155
      jpanel1.add(btnAuthenticationConfig,cc.xy(3,1));
156 156

  
157 157
      btnAuthenticationTest.setActionCommand("...");
158
      btnAuthenticationTest.setIcon(loadImage("datos/devel/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/resources/org/gvsig/online/swing/impl/images/online-auth-test.png"));
158
      btnAuthenticationTest.setIcon(loadImage("datos/devel/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.downloader/org.gvsig.downloader.swing/org.gvsig.downloader.swing.impl/src/main/resources/org/gvsig/downloader/swing/impl/images/downloader-auth-test.png"));
159 159
      btnAuthenticationTest.setName("btnAuthenticationTest");
160 160
      EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2);
161 161
      btnAuthenticationTest.setBorder(emptyborder2);
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.downloader/org.gvsig.downloader.app/org.gvsig.downloader.app.mainplugin/src/main/resources-plugin/config.xml
12 12
  or visit our website www.gvsig.com. -->
13 13
<plugin-config>
14 14
  <depends plugin-name="org.gvsig.app.mainplugin" />
15
  <depends plugin-name="org.gvsig.h2spatial.h2gis132.app.mainplugin" />
16 15
  <resourceBundle name="text" />
17 16
  <libraries library-dir="lib" />
18 17
  <extensions>
19 18

  
20 19

  
21
    <extension class-name="org.gvsig.xml2db.app.mainplugin.Xml2dbExtension"
20
    <extension class-name="org.gvsig.downloader.app.mainplugin.DownloaderExtension"
22 21
      description="" active="true" priority="1">
23
        
24
      <action 
25
            name="tools-xml2db-createdbfromxml" 
26
            label="_Xml2db_Create_database_from_xml" 
27
            tooltip="_Xml2db_Create_database_from_xml"
28
            position="902003100" 
29
            action-command="tools-xml2db-createdbfromxml" 
30
            icon="tools-xml2db-createdbfromxml"
31
            accelerator="" 
32
      />
33

  
34
      <action 
35
            name="tools-xml2db-importxml2db" 
36
            label="_Xml2db_Import_xml_data_to_a_existing_database" 
37
            tooltip="_Xml2db_Import_xml_data_to_a_existing_database"
38
            position="902003200" 
39
            action-command="tools-xml2db-importxml2db" 
40
            icon="tools-xml2db-importxml2db"
41
            accelerator="" 
42
      />
43

  
44
      <action 
45
            name="tools-xml2db-copyxml2db" 
46
            label="_Xml2db_Create_database_and_import_from_xml" 
47
            tooltip="_Xml2db_Create_database_and_import_from_xml"
48
            position="902003300" 
49
            action-command="tools-xml2db-copyxml2db" 
50
            icon="tools-xml2db-copyxml2db"
51
            accelerator="" 
52
      />
53

  
54
      <menu text="tools/Database/_Xml2db/_Xml2db_Create_database_from_xml" name="tools-xml2db-createdbfromxml" />
55
      <menu text="tools/Database/_Xml2db/_Xml2db_Import_XML_to_database" name="tools-xml2db-importxml2db" />
56
      <menu text="tools/Database/_Xml2db/_Xml2db_Copy_xml_to_database" name="tools-xml2db-copyxml2db" />
57
        
22
                
58 23
    </extension>
59 24

  
60 25

  

Also available in: Unified diff