/ - Diff - gvSIG 3D - gvSIG

     @SuppressWarnings("deprecation")
     public interface MapControl3D extends Component, Disposable, Observable{
         static final String BEFORE_DISPOSE_PANEL_NOTIFICATION =
         static final String BEFORE_DISPOSE_MAPCONTEX3D_NOTIFICATION =
             "MapControl3D.beforeDisposePanel";
         static final String AFTER_DISPOSE_PANEL_NOTIFICATION =
         static final String AFTER_DISPOSE_MAPCONTEX3D_NOTIFICATION =
             "MapControl3D.afterDisposePanel";
         /**

                 Notification n = (Notification) notification;
                 if (n.getType().equalsIgnoreCase(
                     MapControl3D.AFTER_DISPOSE_PANEL_NOTIFICATION)) {
                     MapControl3D.AFTER_DISPOSE_MAPCONTEX3D_NOTIFICATION)) {
                     MapControl3D mapControl3D = (MapControl3D) observable;
                     MapContext mapContext = mapControl3D.getMapContext();

     import gov.nasa.worldwind.avlist.AVKey;
     import gov.nasa.worldwind.avlist.AVList;
     import gov.nasa.worldwind.data.BufferedImageRaster;
     import gov.nasa.worldwind.data.ByteBufferRaster;
     import gov.nasa.worldwind.data.DataRaster;
     import gov.nasa.worldwind.geom.Sector;
     import gov.nasa.worldwind.util.BufferWrapper;
     import java.awt.Dimension;
     import java.awt.Graphics2D;
-...
     import java.awt.geom.AffineTransform;
     import java.awt.geom.Point2D;
     import java.awt.image.BufferedImage;
     import java.awt.image.DataBufferByte;
     import java.awt.image.WritableRaster;
     import java.nio.ByteBuffer;
     import org.cresques.cts.ICoordTrans;
     import org.cresques.cts.IProjection;
-...
                     new Object[] { degrees[0], degrees[1], degrees[2], degrees[3] });
                 return;
             } catch (ReadException e) {
                 LOG.warn("Can't get full envelope of {}", layer.getInfoString());
                 LOG.warn("Can't get full envelope of {}", layer.getName());
+            }
             int canvasWidth = canvas.getWidth();
-...
             viewPort.refreshExtent();
             try {
                 layer.draw(image, (Graphics2D) image.getGraphics(), viewPort,
                     mapControl3D.getCancellable(), getScale(viewPort));

         public void dispose() {
             Notification beforeDisposeNotification =
                 new BaseNotification(MapControl3D.BEFORE_DISPOSE_PANEL_NOTIFICATION,
                     null);
             observableHelper.notifyObservers(this,beforeDisposeNotification);
             this.cancellable.setCanceled(true);
             try {
                 // It is necessary to wait to draw threads check cancellable object
                 // before dispose MapControl3D
                 Thread.sleep(100);
             } catch (InterruptedException e) {
                 LOG.warn("This thread has been interrupted when it was waitting until layers cancel drawing");
+            }
             Thread disposeThread = new Thread(new Runnable() {
                 public void run() {
                     Notification beforeDisposeNotification =
                         new BaseNotification(
                             MapControl3D.BEFORE_DISPOSE_MAPCONTEX3D_NOTIFICATION, null);
             if (this.wwd != null) {
                 this.wwd = null;
+            }
                     observableHelper.notifyObservers(DefaultMapControl3D.this,
                         beforeDisposeNotification);
             WorldWind.shutDown();
                     while(WorldWind.getRetrievalService().hasActiveTasks()){
                         try {
                             Thread.sleep(100);
                         } catch (InterruptedException e) {
                             LOG.warn("This thread has been interrupted, dispose action can not be performed");
                             return;
+                        }
+                    }
                     disposeWwd();
                     Notification afterDisposeNotification =
                         new BaseNotification(
                             MapControl3D.AFTER_DISPOSE_MAPCONTEX3D_NOTIFICATION, null);
                     observableHelper
                         .notifyObservers(DefaultMapControl3D.this, afterDisposeNotification);
+                }
             }, "Dispose World Wind thread");
             this.cancellable.setCanceled(false);
             Notification afterDisposeNotification =
                 new BaseNotification(MapControl3D.AFTER_DISPOSE_PANEL_NOTIFICATION,
                     null);
             observableHelper.notifyObservers(this,afterDisposeNotification);
             disposeThread.start();
+        }
         public Cancellable getCancellable(){
-...
+            }
             return this.wwd;
+        }
         private void disposeWwd(){
             if (getWwd() != null) {
                 this.wwd = null;
+            }
+        }
         public void hideAtmosphere() {
             hideLayer(SkyGradientLayer.class);

      * @author <a href="mailto:lmarques@disid.com">Lluis Marques</a>
+     *
      */
     public class DefaultView3DPanel extends JPanel implements View3DPanel, ComponentListener {
     public class DefaultView3DPanel extends JPanel implements View3DPanel {
         private static final long serialVersionUID = -87105248886531868L;
         private ObservableHelper observableHelper;
-...
             this.add(mapControl3D.asJComponent(), BorderLayout.CENTER);
             this.addComponentListener(this);
             this.addComponentListener(new ComponentListener() {
                 public void componentShown(ComponentEvent e) {
+                }
                 public void componentResized(ComponentEvent e) {
+                }
                 public void componentMoved(ComponentEvent e) {
+                }
                 public void componentHidden(ComponentEvent e) {
                     getMapControl3D().dispose();
+                }
             });
+        }
         public JComponent asJComponent() {
-...
                 WindowManager.MODE.WINDOW);
+        }
         @Override
         public boolean requestFocusInWindow() {
             return super.requestFocusInWindow();
+        }
         public void addObserver(Observer o) {
             if(observableHelper != null){
                 observableHelper.addObserver(o);
-...
                 observableHelper.deleteObservers();
+            }
+        }
         public void componentResized(ComponentEvent e) {
+        }
         public void componentMoved(ComponentEvent e) {
+        }
         public void componentShown(ComponentEvent e) {
+        }
         public void componentHidden(ComponentEvent e) {
             getMapControl3D().dispose();
+        }
+    }

     import org.gvsig.app.project.documents.view.gui.IView;
     import org.gvsig.fmap.mapcontext.MapContext;
     import org.gvsig.fmap.mapcontext.layers.FLayers;
     import org.gvsig.tools.observer.Notification;
     import org.gvsig.tools.observer.Observable;
     import org.gvsig.tools.observer.Observer;
     import org.gvsig.view3d.swing.api.MapControl3D;
     import org.gvsig.view3d.swing.api.View3DPanel;
     import org.gvsig.view3d.swing.api.View3DSwingLocator;
-...
      * @author <a href="mailto:lmarques@disid.com">Lluis Marques</a>
+     *
      */
     public class View3DExtension extends Extension {
     public class View3DExtension extends Extension implements Observer{
         public void initialize() {
             registerIcons();
-...
                     View3DPanel view3DPanel =
                         manager.createView3DPanel(view.getMapControl()
                             .getMapContext(), type);
                     view3DPanel.getMapControl3D().addObserver(this);
                     view3DPanel.show();
+                }
+            }
-...
             return true;
+        }
         public void update(Observable observable, Object notification) {
             if (observable instanceof MapControl3D
                 && notification instanceof Notification) {
                 Notification n = (Notification) notification;
                 if (n.getType().equalsIgnoreCase(
                     MapControl3D.AFTER_DISPOSE_MAPCONTEX3D_NOTIFICATION)) {
                     ApplicationManager appManager = ApplicationLocator.getManager();
                     appManager.refreshMenusAndToolBars();
+                }
+            }
+        }
+    }

Application: gvSIG desktop » gvSIG 3D

Revision 473