Revision 7452

View differences:

trunk/libraries/libCorePlugin/src/com/iver/core/mdiManager/NewSkin.java
55 55
import java.awt.event.WindowEvent;
56 56
import java.beans.PropertyVetoException;
57 57
import java.util.ArrayList;
58
import java.util.Collection;
58 59
import java.util.Iterator;
60
import java.util.TreeMap;
59 61

  
60 62
import javax.swing.DefaultDesktopManager;
61 63
import javax.swing.DesktopManager;
......
840 842
        return true;
841 843
    }
842 844

  
845
    /**
846
     * @see com.iver.andami.ui.mdiManager.MDIManager#getAllWindows()
847
     */
843 848
    public IWindow[] getAllWindows() {
844
        ArrayList views = new ArrayList();
849
        ArrayList windows = new ArrayList();
845 850
        Iterator i = fvs.getWindowIterator();
846 851

  
847 852
        while (i.hasNext()) {
848
            views.add((IWindow) i.next());
853
            windows.add((IWindow) i.next());
849 854
        }
850
        return (IWindow[]) views.toArray(new IWindow[0]);
855
        return (IWindow[]) windows.toArray(new IWindow[0]);
851 856
    }
857
    
858
    public IWindow[] getOrderedWindows() {
859
        //ArrayList windows = new ArrayList();
860
        TreeMap windows = new TreeMap();
861
        Iterator winIterator = fvs.getWindowIterator();       
862
        
863
        JInternalFrame frame;
864
        IWindow win;
865
        /**
866
         * The order of the window in the JDesktopPane. Smaller numbers
867
         * are closer to the foreground.
868
         */
869
        int zPosition;
870
        while (winIterator.hasNext()) {
871
        	win = (IWindow) winIterator.next();
872
        	frame = fvs.getJInternalFrame(win);
873
        	
874
        	zPosition = panel.getPosition(frame);
875
        	windows.put(new Integer(zPosition), win);
876
        }
877
        winIterator = windows.values().iterator();
878
        ArrayList winList = new ArrayList();
879
        while (winIterator.hasNext()) {
880
        	winList.add(winIterator.next());
881
        }
852 882

  
883
        return (IWindow[]) winList.toArray(new IWindow[0]);
884
    }
885

  
853 886
    public void setMaximum(IWindow v, boolean bMaximum) throws PropertyVetoException
854 887
    {
855 888
        JInternalFrame f = fvs.getJInternalFrame(v);
trunk/frameworks/_fwAndami/src/com/iver/andami/ui/mdiFrame/NewStatusBar.java
98 98
	 * This method initializes this
99 99
	 */
100 100
	private void initialize() {
101
		this.setPreferredSize(new java.awt.Dimension(183,20));
102
		this.setSize(new java.awt.Dimension(183,20));
101 103
		lblIcon = new JLabel();
102 104
		lblTexto = new JLabel();
103 105

  
104 106
		FlowLayout flowLayout2 = new FlowLayout();
105 107
		this.setLayout(flowLayout2);
106 108
		flowLayout2.setHgap(1);
107
		flowLayout2.setVgap(0);
109
		flowLayout2.setVgap(2);
108 110
		flowLayout2.setAlignment(java.awt.FlowLayout.LEFT);
109 111
		lblIcon.setText("");
110 112
		lblTexto.setText(Messages.getString("StatusBar.Aplicacion_iniciada"));
......
288 290
		for (int i = 0; i < labels.length; i++) {
289 291
			JLabel lbl = new JLabel();
290 292
			lbl.setPreferredSize(new Dimension(labels[i].getSize(),
291
					this.getHeight()));
292
			lbl.setSize(new Dimension(labels[i].getSize(), this.getHeight()));
293
					this.getHeight() - 2));
294
			lbl.setSize(new Dimension(labels[i].getSize(), this.getHeight() - 2));
293 295
			lbl.setBorder(BorderFactory.createBevelBorder(BevelBorder.LOWERED));
294 296
			this.add(lbl);
295 297

  
......
350 352
			if (label.getText().compareTo("") != 0) {
351 353
				label.setVisible(true);
352 354
				label.setPreferredSize(new Dimension((int) (widthlabels[i]),
353
						this.getHeight()));
355
						this.getHeight() - 2));
354 356
			} else {
355 357
				label.setVisible(false);
356 358

  
trunk/frameworks/_fwAndami/src/com/iver/andami/ui/mdiManager/MDIManager.java
116 116
     */
117 117
    public IWindow getFocusWindow();
118 118
    /**
119
     * Obtiene una referencia a los paneles de todas las vista no modales que
120
     * hay en la aplicaci?n en la aplicaci?n.
119
     * Obtiene una referencia a los paneles de todas las ventanas no modales que
120
     * hay en la aplicaci?n.
121 121
     *
122 122
     * @return Un vector con todos los paneles que contiene la aplicaci?n.
123 123
     */
124 124
    public IWindow[] getAllWindows();
125
    /**
126
     * Gets a reference to the panels of all the non modal windows present in
127
     * the application. The panels are provided in the same order that
128
     * they have in the application.
129
     * 
130
     * @return An ordered array containing all the panels in the application.
131
     * The first element of the array is the topmost (foreground) window in the
132
     * application. The last element is the botton (background) window.
133
     */
134
    public IWindow[] getOrderedWindows();
125 135

  
126 136
    /**
127 137
     * Cierra la ventana SingletonView cuya clase se pasa como par?metro y cuyo

Also available in: Unified diff