Revision 44173

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/java/org/gvsig/andami/ui/mdiManager/MDIManager.java
23 23
 */
24 24
package org.gvsig.andami.ui.mdiManager;
25 25

  
26
import java.awt.Dialog;
26 27
import java.awt.GridBagConstraints;
28
import java.awt.Window;
27 29
import java.awt.image.BufferedImage;
28 30
import java.beans.PropertyVetoException;
29 31
import java.util.Locale;
......
340 342
    public IWindow getWindow(JPanel panel);
341 343
    
342 344
    public BufferedImage getImagePreview();
345

  
346
    public boolean isModalDialogShowing();
343 347
}
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/project/documents/view/expressionevaluator/ViewCapturePointElement.java
2 2

  
3 3
import java.awt.Dialog;
4 4
import java.awt.Window;
5
import org.gvsig.app.ApplicationLocator;
6
import org.gvsig.app.ApplicationManager;
5 7
import org.gvsig.expressionevaluator.ExpressionBuilder;
6 8
import org.gvsig.expressionevaluator.ExpressionBuilder.Config;
7 9
import org.gvsig.expressionevaluator.ExpressionBuilder.GeometrySupportType;
......
82 84

  
83 85
    @Override
84 86
    public boolean isEnabled() {
85
        return ! isModalDialogShowing();
87
        ApplicationManager application = ApplicationLocator.getManager();
88
        return ! application.getUIManager().isModalDialogShowing();
86 89
    }
87

  
88
    private static boolean isModalDialogShowing() {
89
        Window[] windows = Window.getWindows();
90
        if (windows != null) { // don't rely on current implementation, which at least returns [0].
91
            for (Window w : windows) {
92
                if (w.isShowing() && w instanceof Dialog && ((Dialog) w).isModal()) {
93
                    return true;
94
                }
95
            }
96
        }
97
        return false;
98
    }
99 90
}
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/project/documents/view/expressionevaluator/ViewCaptureRectangleElement.java
2 2

  
3 3
import java.awt.Dialog;
4 4
import java.awt.Window;
5
import org.gvsig.app.ApplicationLocator;
6
import org.gvsig.app.ApplicationManager;
5 7
import org.gvsig.expressionevaluator.ExpressionBuilder;
6 8
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
7 9
import org.gvsig.expressionevaluator.swing.Element.CalculatedElement;
......
78 80
        return this.aditionalPanel;
79 81
    }
80 82

  
83
    @Override
81 84
    public boolean isEnabled() {
82
        return ! isModalDialogShowing();
85
        ApplicationManager application = ApplicationLocator.getManager();
86
        return ! application.getUIManager().isModalDialogShowing();
83 87
    }
84 88

  
85
    private static boolean isModalDialogShowing() {
86
        Window[] windows = Window.getWindows();
87
        if (windows != null) { // don't rely on current implementation, which at least returns [0].
88
            for (Window w : windows) {
89
                if (w.isShowing() && w instanceof Dialog && ((Dialog) w).isModal()) {
90
                    return true;
91
                }
92
            }
93
        }
94
        return false;
95
    }
96

  
97 89
}
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.coreplugin.app/org.gvsig.coreplugin.app.mainplugin/src/main/java/org/gvsig/coreplugin/mdiManager/NewSkin.java
27 27
import java.awt.Component;
28 28
import java.awt.Container;
29 29
import java.awt.Cursor;
30
import java.awt.Dialog;
30 31
import java.awt.Dimension;
31 32
import java.awt.Graphics;
32 33
import java.awt.KeyEventDispatcher;
33 34
import java.awt.Point;
35
import java.awt.Window;
34 36
import java.awt.event.ActionEvent;
35 37
import java.awt.event.ActionListener;
36 38
import java.awt.event.ComponentEvent;
......
1443 1445
        }
1444 1446
    }
1445 1447

  
1448
    public boolean isModalDialogShowing() {
1449
        Window[] windows = Window.getWindows();
1450
        if (windows != null) { // don't rely on current implementation, which at least returns [0].
1451
            for (Window w : windows) {
1452
                if (w.isShowing() && w instanceof Dialog && ((Dialog) w).isModal()) {
1453
                    return true;
1454
                }
1455
            }
1456
        }
1457
        return false;
1458
    }
1446 1459
}

Also available in: Unified diff