/ - Diff - | gvSIG desktop 1 - gvSIG

Revision 38514

     import org.gvsig.fmap.mapcontrol.tools.snapping.snappers.ISnapperGeometriesVectorial;
     import org.gvsig.fmap.mapcontrol.tools.snapping.snappers.ISnapperRaster;
     import org.gvsig.fmap.mapcontrol.tools.snapping.snappers.ISnapperVectorial;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dispose.Disposable;
     import org.gvsig.tools.dispose.impl.AbstractDisposable;
     import org.gvsig.tools.exception.BaseException;
     import org.gvsig.tools.observer.Observable;
     import org.gvsig.tools.observer.Observer;
     import org.gvsig.tools.task.Cancellable;
-...
      * @author Pablo Piqueras Bartolom? (pablo.piqueras@iver.es)
      */
     public class MapControl extends JComponent implements ComponentListener,
         Observer {
         Observer, Disposable {
         protected static final GeometryManager geomManager =
             GeometryLocator.getGeometryManager();
         protected static final Logger logger =
         private static final Logger LOG =
             LoggerFactory.getLogger(GeometryManager.class);
         /**
-...
          */
         private MapControlDrawer mapControlDrawer = null;
     	private Cursor transparentCursor;
     	private boolean disposed = false;
         /**
          * <p>
-...
+                        }
                     });
             initializeGrid();
             if(ToolsLocator.getDisposableManager() != null) {
     			ToolsLocator.getDisposableManager().bind(this);
     		} else {
     			LOG.warn("Can't retrieve the disposable manager,");
+    		}
+        }
         /**
-...
             try {
                 mapControlDrawer.startDrawing(this);
             } catch (InterruptedException e) {
                 logger.error("Error locking the MapControlDrawer", e);
                 LOG.error("Error locking the MapControlDrawer", e);
+            }
             mapControlDrawer.setGraphics(g);
             mapControlDrawer.stopDrawing(this);
-...
              */
             private boolean shutdown;
     		private Thread worker;
             /**
              * <p>
              * Sets this <code>Drawer2</code>'s worker to finish or continue with
-...
              */
             public void setShutdown(boolean isShutdown) {
                 shutdown = isShutdown;
                 if (shutdown) {
                 	worker.interrupt();
+                }
+            }
             /**
-...
                 waitingRequest = null;
                 waiting = false;
                 shutdown = false;
                 new Thread(new Worker(), "MapControl Drawer Worker").start();
                 worker = new Thread(new Worker(), "MapControl Drawer Worker");
                 worker.start();
+            }
             /**
-...
                         // System.out.println("Pintando");
                         if (image != null) {
                             cancelDrawing();
                             p.paint();
                             if (p != null) {
                             	p.paint();
+                            }
                         } else {
                             status = DESACTUALIZADO;
+                        }
-...
                                 vp.setEnvelope(geomManager.createEnvelope(x, y, x
                                     + width, y + height, SUBTYPES.GEOM2D));
                             } catch (CreateEnvelopeException e1) {
                                 logger.error("Error creating the envelope", e);
                                 LOG.error("Error creating the envelope", e);
+                            }
+                        }
-...
                 e = Converter.convertEnvelopeToJTS(r);
             } catch (CreateEnvelopeException e1) {
                 logger.error("Error creating the envelope", e1);
                 LOG.error("Error creating the envelope", e1);
+            }
             usedSnap = null;
-...
                 return getViewPort().toMapPoint(adjustedPoint);
+            }
+        }
     	public synchronized void dispose() {
     		// Check if we have already been disposed, and don't do it again
     		if (!disposed && ToolsLocator.getDisposableManager().release(this)) {
     			drawer.setShutdown(true);
     			disposed = true;
+    		}
+    	}
+    }

     import java.awt.Graphics;
     import java.awt.image.BufferedImage;
     import java.beans.PropertyChangeEvent;
     import java.beans.PropertyChangeListener;
     import javax.swing.JPanel;
     import javax.swing.JSplitPane;
-...
     import org.gvsig.andami.messages.NotificationManager;
     import org.gvsig.andami.ui.mdiManager.IWindowTransform;
     import org.gvsig.andami.ui.mdiManager.WindowInfo;
     import org.gvsig.app.project.ProjectManager;
     import org.gvsig.app.project.documents.gui.WindowLayout;
     import org.gvsig.app.project.documents.view.MapOverview;
     import org.gvsig.app.project.documents.view.ViewDocument;
-...
      */
     public abstract class AbstractViewPanel extends JPanel implements IView,
         IWindowTransform {
         IWindowTransform, PropertyChangeListener {
         private static final long serialVersionUID = -259620280790490262L;
-...
          * @see initialize()
          */
         public AbstractViewPanel() {
             // Do nothing
         	ProjectManager.getInstance().getCurrentProject().addPropertyChangeListener(this);
+        }
         /**
-...
         public void setWindowLayout(WindowLayout data) {
             windowLayout = data;
+        }
     	public void propertyChange(PropertyChangeEvent evt) {
     		// Detect when the related document has been removed
     		// and close or dispose whatever is needed
     		if ("delDocument".equals(evt.getPropertyName())) {
     			if (evt.getOldValue() != null
     					&& evt.getOldValue() instanceof ViewDocument) {
     				ViewDocument viewDocument = (ViewDocument) evt.getOldValue();
     				ViewDocument myViewDocument = getViewDocument();
     				if (myViewDocument != null
     						&& myViewDocument.equals(viewDocument)) {
     					m_MapControl.dispose();
     					m_MapLoc.dispose();
+    				}
+    			}
+    		}
+    	}
+    }

Also available in: Unified diff