Revision 6877 trunk/libraries/libCorePlugin/src/com/iver/core/mdiManager/NewSkin.java

View differences:

NewSkin.java
81 81
import com.iver.andami.ui.mdiManager.MDIUtilities;
82 82
import com.iver.andami.ui.mdiManager.SingletonDialogAlreadyShownException;
83 83
import com.iver.andami.ui.mdiManager.SingletonView;
84
import com.iver.andami.ui.mdiManager.View;
84
import com.iver.andami.ui.mdiManager.IWindow;
85 85
import com.iver.andami.ui.mdiManager.ViewInfo;
86 86
import com.iver.andami.ui.mdiManager.ViewListener;
87 87
import com.iver.core.StatusBar;
......
154 154
        PluginServices.registerKeyStroke(controlTab, new KeyEventDispatcher() {
155 155

  
156 156
			public boolean dispatchKeyEvent(KeyEvent e) {
157
				View[] views = getAllViews();
157
				IWindow[] views = getAllViews();
158 158
				if (views.length<=0 || e.getID() == KeyEvent.KEY_PRESSED)
159 159
					return false;
160 160

  
......
174 174
    }
175 175

  
176 176
    /**
177
     * @see com.iver.andami.ui.mdiManager.MDIManager#addView(com.iver.andami.ui.mdiManager.View)
177
     * @see com.iver.andami.ui.mdiManager.MDIManager#addView(com.iver.andami.ui.mdiManager.IWindow)
178 178
     */
179
    public View addView(View p) throws SingletonDialogAlreadyShownException {
179
    public IWindow addView(IWindow p) throws SingletonDialogAlreadyShownException {
180 180
        // se obtiene la informaci?n de la vista
181 181
        ViewInfo vi = vis.getViewInfo(p);
182 182

  
......
208 208
                addJInternalFrame(frame, vi);
209 209
                vss.add(p, new ActionListener() {
210 210
                    public void actionPerformed(ActionEvent e) {
211
                        View v = vis.getViewById(Integer.parseInt(e
211
                        IWindow v = vis.getViewById(Integer.parseInt(e
212 212
                                .getActionCommand()));
213 213
                        JInternalFrame f = fvs.getJInternalFrame(v);
214 214
                        activateJInternalFrame(f);
......
230 230
                // Se sit?a la vista en la pila de vistas
231 231
                vss.add(p, new ActionListener() {
232 232
                    public void actionPerformed(ActionEvent e) {
233
                        View v = vis.getViewById(Integer.parseInt(e
233
                        IWindow v = vis.getViewById(Integer.parseInt(e
234 234
                                .getActionCommand()));
235 235
                        JInternalFrame f = fvs.getJInternalFrame(v);
236 236
                        activateJInternalFrame(f);
......
246 246
    /**
247 247
     * Similar method as 'addView' but in this case centres the new JInternalFrame of the View in the contentPane of the MainFrame
248 248
     * 
249
     * @see com.iver.core.mdiManager.NewSkin#addView(com.iver.andami.ui.mdiManager.View)
249
     * @see com.iver.core.mdiManager.NewSkin#addView(com.iver.andami.ui.mdiManager.IWindow)
250 250
     * 
251 251
     * @author Pablo Piqueras Bartolom?
252 252
     */
253
	public View addCentredView(View p) throws SingletonDialogAlreadyShownException {
253
	public IWindow addCentredView(IWindow p) throws SingletonDialogAlreadyShownException {
254 254
	    // se obtiene la informaci?n de la vista
255 255
        ViewInfo vi = vis.getViewInfo(p);
256 256

  
......
282 282
                addJInternalFrame(frame, vi);
283 283
                vss.add(p, new ActionListener() {
284 284
                    public void actionPerformed(ActionEvent e) {
285
                        View v = vis.getViewById(Integer.parseInt(e
285
                        IWindow v = vis.getViewById(Integer.parseInt(e
286 286
                                .getActionCommand()));
287 287
                        JInternalFrame f = fvs.getJInternalFrame(v);
288 288
                        centreJInternalFrame(f); // Centre this JInternalFrame
......
307 307
                // Se sit?a la vista en la pila de vistas
308 308
                vss.add(p, new ActionListener() {
309 309
                    public void actionPerformed(ActionEvent e) {
310
                        View v = vis.getViewById(Integer.parseInt(e
310
                        IWindow v = vis.getViewById(Integer.parseInt(e
311 311
                                .getActionCommand()));
312 312
                        JInternalFrame f = fvs.getJInternalFrame(v);                        
313 313
                        activateJInternalFrame(f);
......
399 399
     *
400 400
     * @param p
401 401
     */
402
    private void addJInternalFrame(View p) {
402
    private void addJInternalFrame(IWindow p) {
403 403
        ViewInfo vi = vis.getViewInfo(p);
404 404

  
405 405
        JInternalFrame wnd = fvs.getJInternalFrame(p);
......
448 448
     *
449 449
     * @param p
450 450
     */
451
    private void addJDialog(View p) {
451
    private void addJDialog(IWindow p) {
452 452
        JDialog dlg = fvs.getJDialog(p);
453 453

  
454 454
        centerDialog(dlg);
......
462 462
    /**
463 463
     * @see com.iver.andami.ui.mdiManager.MDIManager#getActiveView()
464 464
     */
465
    public View getActiveView() {
465
    public IWindow getActiveView() {
466 466
        JInternalFrame jif = panel.getSelectedFrame();
467 467

  
468 468
        if (jif != null) {
469
            View theView = fvs.getView(jif);
469
            IWindow theView = fvs.getView(jif);
470 470
            if (theView == null)
471 471
                return null;
472 472
            if (theView.getViewInfo().isPalette())
......
478 478

  
479 479
        return null;
480 480
    }
481
    public View getFocusView(){
481
    public IWindow getFocusView(){
482 482
    	 JInternalFrame jif = panel.getSelectedFrame();
483 483

  
484 484
         if (jif != null) {
485
             View theView = fvs.getView(jif);
485
             IWindow theView = fvs.getView(jif);
486 486
             if (theView == null)
487 487
                 return null;
488 488
             return fvs.getView(jif);
......
490 490
         return null;
491 491
    }
492 492
    /**
493
     * @see com.iver.andami.ui.mdiManager.MDIManager#closeView(com.iver.andami.ui.mdiManager.View)
493
     * @see com.iver.andami.ui.mdiManager.MDIManager#closeView(com.iver.andami.ui.mdiManager.IWindow)
494 494
     */
495
    public void closeView(View p) {
495
    public void closeView(IWindow p) {
496 496
        // Si es un di?logo modal
497 497
        if (p.getViewInfo().isModal()) {
498 498
            closeJDialog();
......
509 509
        Iterator i = fvs.getViewIterator();
510 510

  
511 511
        while (i.hasNext()) {
512
            eliminar.add((View) i.next());
512
            eliminar.add((IWindow) i.next());
513 513
        }
514 514

  
515 515
        for (Iterator iter = eliminar.iterator(); iter.hasNext();) {
516
            View vista = (View) iter.next();
516
            IWindow vista = (IWindow) iter.next();
517 517
            closeView(vista);
518 518
        }
519 519
    }
520 520

  
521 521
    /**
522
     * @see com.iver.andami.ui.mdiManager.MDIManager#getViewInfo(com.iver.andami.ui.mdiManager.View)
522
     * @see com.iver.andami.ui.mdiManager.MDIManager#getViewInfo(com.iver.andami.ui.mdiManager.IWindow)
523 523
     */
524
    public ViewInfo getViewInfo(View v) {
524
    public ViewInfo getViewInfo(IWindow v) {
525 525
    	//ViewInfo vi = new ViewInfo();
526 526
    	ViewInfo vi = vis.getViewInfo(v);
527 527
    	JInternalFrame f = fvs.getJInternalFrame(v);
......
548 548

  
549 549
        dlg.setVisible(false);
550 550

  
551
        View s = (View) fvs.getView(dlg);
551
        IWindow s = (IWindow) fvs.getView(dlg);
552 552

  
553 553
        callViewClosed(s);
554 554

  
......
566 566
     * @param view
567 567
     *            DOCUMENT ME!
568 568
     */
569
    private void callViewClosed(View view) {
569
    private void callViewClosed(IWindow view) {
570 570
        if (view instanceof ViewListener) {
571 571
            ((ViewListener) view).viewClosed();
572 572
        }
......
578 578
     * @param view
579 579
     *            DOCUMENT ME!
580 580
     */
581
    private void callViewActivated(View view) {
581
    private void callViewActivated(IWindow view) {
582 582
        logger.debug("View " + view.getViewInfo().getTitle()
583 583
                + " activated (callViewActivated)");
584 584
        if (view instanceof ViewListener) {
......
593 593
     */
594 594
    private void closeJInternalFrame(JInternalFrame frame) {
595 595
        try {
596
            View s = (View) fvs.getView(frame);
596
            IWindow s = (IWindow) fvs.getView(frame);
597 597

  
598 598
            frame.setClosed(true);
599 599
            callViewClosed(s);
......
691 691

  
692 692
            // activatedInternalFramesStack.push(e.getInternalFrame());
693 693

  
694
            View panel = fvs.getView((JInternalFrame) e.getSource());
694
            IWindow panel = fvs.getView((JInternalFrame) e.getSource());
695 695

  
696 696
            ViewInfo vi = vis.getViewInfo(panel);
697 697
            if (vi.isPalette())
......
729 729
            // e.getInternalFrame().getTitle());
730 730

  
731 731
            JInternalFrame c = (JInternalFrame) e.getSource();
732
            ViewInfo vi = vis.getViewInfo((View) fvs.getView(c));
732
            ViewInfo vi = vis.getViewInfo((IWindow) fvs.getView(c));
733 733

  
734
            View view = fvs.getView(c);
734
            IWindow view = fvs.getView(c);
735 735
            callViewClosed(view);
736 736
            boolean alwaysLive;
737 737
            if (view instanceof SingletonView) {
......
750 750

  
751 751
            // Para activar el JInternalFrame desde la que hemos
752 752
            // abierto la ventana que estamos cerrando
753
            View lastView = vss.getActiveView();
753
            IWindow lastView = vss.getActiveView();
754 754
            // La activamos
755 755
            if (lastView != null) {
756 756
                System.err.println("Devuelvo el foco a "
......
774 774
            // logger.debug("internalDeActivated " +
775 775
            // e.getInternalFrame().getTitle());
776 776
            JInternalFrame c = (JInternalFrame) e.getSource();
777
            View andamiView = fvs.getView(c);
777
            IWindow andamiView = fvs.getView(c);
778 778
            if (andamiView != null) {
779 779
                ViewInfo vi = vis.getViewInfo(andamiView);
780 780
                if (vi.isPalette())
......
832 832
        return true;
833 833
    }
834 834

  
835
    public View[] getAllViews() {
835
    public IWindow[] getAllViews() {
836 836
        ArrayList views = new ArrayList();
837 837
        Iterator i = fvs.getViewIterator();
838 838

  
839 839
        while (i.hasNext()) {
840
            views.add((View) i.next());
840
            views.add((IWindow) i.next());
841 841
        }
842
        return (View[]) views.toArray(new View[0]);
842
        return (IWindow[]) views.toArray(new IWindow[0]);
843 843
    }
844 844

  
845
    public void setMaximum(View v, boolean bMaximum) throws PropertyVetoException
845
    public void setMaximum(IWindow v, boolean bMaximum) throws PropertyVetoException
846 846
    {
847 847
        JInternalFrame f = fvs.getJInternalFrame(v);
848 848
        f.setMaximum(bMaximum);
849 849
    }
850 850

  
851
    public void changeViewInfo(View v, ViewInfo vi){
851
    public void changeViewInfo(IWindow v, ViewInfo vi){
852 852
    	JInternalFrame f = fvs.getJInternalFrame(v);
853 853
		f.setDefaultCloseOperation(JInternalFrame.DISPOSE_ON_CLOSE);
854 854
		JDesktopPane pnl = f.getDesktopPane();

Also available in: Unified diff