Revision 44075

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/java/org/gvsig/andami/ui/splash/MultiSplashWindow.java
44 44
import javax.swing.JLabel;
45 45
import javax.swing.JProgressBar;
46 46
import javax.swing.JWindow;
47
import javax.swing.SwingUtilities;
47 48
import javax.swing.Timer;
48 49

  
49 50
import org.gvsig.andami.PluginServices;
......
253 254
        repaint();
254 255
    }
255 256

  
256
    public void process(String str) {
257
    public void process(final String str) {
258
        if( !SwingUtilities.isEventDispatchThread() ) {
259
            try {
260
                SwingUtilities.invokeAndWait(new Runnable() {
261
                    @Override
262
                    public void run() {
263
                        process(str);
264
                    }
265
                });
266
            } catch (Exception ex) {
267
            }
268
            return;
269
        }
257 270
        lblStatus.setText(str);
271
        lblStatus.paintImmediately(lblStatus.getVisibleRect());
272
        
258 273
        this.progress++;
259 274
        if( this.progress <= pb.getMaximum() ) {
260 275
        	pb.setValue(this.progress);
276
                pb.paintImmediately(pb.getVisibleRect());
261 277
        }
262
        doLayout();
263
        repaint();
264 278
    }
265 279

  
266 280
    public void mouseClicked(MouseEvent e) {
trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/java/org/gvsig/andami/ui/mdiFrame/NewStatusBar.java
50 50
import org.apache.commons.lang3.StringUtils;
51 51

  
52 52
import org.gvsig.andami.IconThemeHelper;
53
import org.gvsig.andami.PluginServices;
54 53
import org.gvsig.andami.messages.Messages;
55 54
import org.gvsig.andami.plugins.config.generate.Label;
56 55
import org.gvsig.gui.beans.controls.IControl;
......
145 144
        lblTexto.setText(Messages.getString("StatusBar.Aplicacion_iniciada"));
146 145

  
147 146
        JPanel panelLeft = new JPanel();
148
        panelLeft.setLayout(new FlowLayout(FlowLayout.LEFT, 1, 0));
149
        panelLeft.add(lblIcon);
150
        panelLeft.add(lblTexto);
151
        panelLeft.add(getProgressBar());
147
        panelLeft.setLayout(new BorderLayout(1,1));
148
        panelLeft.add(lblIcon, BorderLayout.LINE_START);
149
        panelLeft.add(lblTexto, BorderLayout.CENTER);
150
//        panelLeft.add(getProgressBar());
152 151

  
153 152
        this.add(panelLeft, BorderLayout.CENTER);
154 153
        this.add(panelRight, BorderLayout.EAST);
......
170 169
    	this.textoCompleto = "";
171 170
    	lblTexto.setText("");
172 171
    	lblIcon.setIcon(null);
172
        lblTexto.paintImmediately(lblTexto.getVisibleRect());
173
        lblIcon.paintImmediately(lblIcon.getVisibleRect());
173 174
    	estado = INFO;
174 175
    }
175 176

  
176 177
    
177
    public void message(final String msg, final int messageTyoe) {
178
    public void message(final String msg, final int messageType) {
178 179
        if (!SwingUtilities.isEventDispatchThread()) {
179 180
            SwingUtilities.invokeLater(new Runnable() {
180 181
                public void run() {
181
                	message(msg,messageTyoe);
182
                	message(msg,messageType);
182 183
                }
183 184
            });
184 185
            return;
......
188 189
            this.clearMessage();
189 190
            return;
190 191
        }
191
    	switch (messageTyoe) {
192
    	switch (messageType) {
192 193
		case JOptionPane.ERROR_MESSAGE:
193 194
			setErrorText(msg);
194 195
			break;
......
200 201
			setInfoText(msg);
201 202
			break;
202 203
		}
203
    	this.doLayout();
204
    	this.repaint();
204
        lblTexto.paintImmediately(lblTexto.getVisibleRect());
205
        lblIcon.paintImmediately(lblIcon.getVisibleRect());
205 206
    	messageTimer.start();
206 207
	}
207 208

  
trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/java/org/gvsig/andami/ui/mdiFrame/MDIFrame.java
262 262

  
263 263
        // Add the status bar of the application
264 264
        bEstado = new NewStatusBar();
265
        bEstado.message(Messages.getString("StatusBar.Aplicacion_iniciada"), JOptionPane.INFORMATION_MESSAGE);
266 265
        getContentPane().add(bEstado, BorderLayout.SOUTH);
267 266

  
268 267
        this.toolBars.addContainerListener(this);
trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/java/org/gvsig/andami/Launcher.java
380 380
        return launcherInstance;
381 381
    }
382 382

  
383
    public static void main(String[] args) throws Exception {
383
    public static void main(final String[] args) throws Exception {
384 384
        arguments = new DefaultArguments(args);
385 385

  
386
        Launcher launcher = getInstance();
386
        final Launcher launcher = getInstance();
387 387
        try {
388 388
            if (arguments.contains("install")) {
389 389
                launcher.doInstall(args);
......
686 686
            public void run() {
687 687
                try {
688 688
                    frame.enableControls();
689
                    message(translate("StatusBar.Aplicacion_iniciada"));
690 689
                } catch (Throwable th) {
691 690
                    logger.warn("Problems enabling controls", th);
692 691
                }
trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/java/org/gvsig/andami/impl/DefaultPluginsManager.java
331 331
        Thread th = new Thread(new Runnable() {
332 332
            public void run() {
333 333
                try {
334
                    Thread.sleep(10);
334
                    Thread.sleep(3);
335 335
                } catch (Exception exc) {
336 336
                    // Ignore error
337 337
                }
......
344 344
                    Task task = startupTasks.get(i);
345 345
                    task.run();
346 346
                }
347
                logger.info("Running startup tasks terminated.");
347 348
            }
348 349
        });
349 350
        th.start();
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/extension/InitializeApplicationExtension.java
99 99
                    "showNewViewMaximized",
100 100
                    new ShowNewMaximizedView(),
101 101
                    true,
102
                    500
102
                    750
103 103
            );
104 104
        }
105
        pluginManager.addStartupTask("OpenLayerOnStart", new OpenLayerOnStart(), true, 400);
105
        pluginManager.addStartupTask("OpenLayerOnStart", new OpenLayerOnStart(), true, 740);
106
        
107
        pluginManager.addStartupTask("ApplicationStartedMessage", new Runnable() {
108
            @Override
109
            public void run() {
110
                I18nManager i18n = ToolsLocator.getI18nManager();
111
                ApplicationManager application = ApplicationLocator.getManager();
112
                application.message(
113
                        i18n.getTranslation("StatusBar.Aplicacion_iniciada"), 
114
                        JOptionPane.INFORMATION_MESSAGE
115
                );
116
            }
117
        }, true, -1);
106 118

  
107 119
    }
108 120

  

Also available in: Unified diff