/ - Diff - gvSIG Document Layout - gvSIG

          * Triggers a notification to the TocModel observers of type
          * {@link TocModelChangedNotification#MODEL_CHANGED}
          */
     	public void notifyTocUpdated();
     	public void notifyTocUpdated(TocModelChangedNotification.Type notificationType);
         public void addTocObserver(TocModelObserver observer);

trunk/org.gvsig.app.document.layout2.app/org.gvsig.app.document.layout2.app.mainplugin/src/main/java/org/gvsig/app/project/documents/layout/DefaultLayoutContext.java
428	428	}
429	429	else {
430	430	tocObservers.notifyObservers(this,
431		new TocModelChangedImpl(TocModelChangedNotification.MODEL_SET, tocModel));
	431	new TocModelChangedImpl(TocModelChangedNotification.Type.MODEL_SET, tocModel));
432	432	}
433	433	}
434	434
435		public void notifyTocUpdated() {
	435	public void notifyTocUpdated(TocModelChangedNotification.Type type) {
436	436	tocObservers.notifyObservers(this,
437		new TocModelChangedImpl(TocModelChangedNotification.MODEL_CHANGED, tocModel));
	437	new TocModelChangedImpl(type, tocModel));
438	438
439	439	}
440	440

+     *
      */
     public interface TocModelChangedNotification {
     	/**
     	 * The model (MapContext object) has been set (understood as
     	 * added, removed or replaced) by a new one, including a null one.
     	 */
     	public static final String MODEL_SET = "model_replaced";
     	/**
     	 * There has been some change on the model (layer added or removed,
     	 * visibility changes, etc)
     	 */
     	public static final String MODEL_CHANGED = "model_changed";
     	public enum Type {
     		/**
     		 * The model (MapContext object) has been set (understood as
     		 * added, removed or replaced) by a new one, including a null one.
     		 */
     		MODEL_SET,
     		/**
     		 * There has been some change on the model collection
     		 * (layer added or removed, visibility changed, etc)
     		 */
     		MODEL_CHANGED;
+    	}
         /**
          * Returns the type of this notification, represented by one of the constants defined in this interface.
          * @return a String containing this notification's type
          */
         public String getType();
         public Type getType();
         /**
          * Gets the added or changed model

     public class TocModelChangedImpl implements TocModelChangedNotification {
     	private MapContext mapContext = null;
     	private String type = null;
     	private Type type = null;
     	public TocModelChangedImpl(String type, MapContext model) {
     	public TocModelChangedImpl(Type type, MapContext model) {
     		this.type = type;
     		this.mapContext = model;
+    	}
-...
     		return mapContext;
+    	}
     	public String getType() {
     	public Type getType() {
     		return type;
+    	}

     import org.gvsig.app.project.documents.layout.FLayoutFunctions;
     import org.gvsig.app.project.documents.layout.FLayoutUtilities;
     import org.gvsig.app.project.documents.layout.LayoutNotification;
     import org.gvsig.app.project.documents.layout.TocModelChangedImpl;
     import org.gvsig.app.project.documents.layout.TocModelChangedNotification;
     import org.gvsig.app.project.documents.view.ViewDocument;
     import org.gvsig.app.project.documents.view.toc.gui.TOC;
     import org.gvsig.compat.print.PrintAttributes;
     import org.gvsig.fmap.dal.exception.ReadException;
     import org.gvsig.fmap.geom.Geometry;
-...
     import org.gvsig.fmap.mapcontext.layers.CancelationException;
     import org.gvsig.fmap.mapcontext.layers.LayerCollectionEvent;
     import org.gvsig.fmap.mapcontext.layers.LayerCollectionListener;
     import org.gvsig.fmap.mapcontext.layers.LayerEvent;
     import org.gvsig.fmap.mapcontext.layers.LayerPositionEvent;
     import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
     import org.gvsig.fmap.mapcontext.rendering.legend.IVectorLegend;
     import org.gvsig.fmap.mapcontext.rendering.legend.events.LegendChangedEvent;
     import org.gvsig.fmap.mapcontext.rendering.legend.events.listeners.LegendListener;
     import org.gvsig.gui.beans.Messages;
-...
         private static final String ENVELOPE_FIELD = "envelope";
         private static final String SHOWGRID_FIELD = "showGrid";
         private static final String GRID_FIELD = "gridview";
         private static final String MAPCONTEXT_FIELD = "mapContext";
         // following fields are unused - should be deleted?
         private static final String EXTENSION_FIELD = "extension";
         private static final String HAS_TOC = "hasToc";
-...
     	protected OwnMapContextListener ownMapContextListener;
     	private boolean b_hasToc = false;
     	private boolean b_updatingToc=false;
         /**
          * Creates a new FFrameView object.
          */
-...
                 definition.addDynFieldBoolean(SHOWGRID_FIELD).setMandatory(true);
                 definition.addDynFieldObject(GRID_FIELD)
                     .setClassOfValue(IFFrame.class).setMandatory(false);
                 definition.addDynFieldObject(MAPCONTEXT_FIELD)
                     .setClassOfValue(MapContext.class).setMandatory(false);
                 definition.addDynFieldBoolean(HAS_TOC).setMandatory(false);
+            }
+        }
-...
             linked = state.getBoolean(BLINKED_FIELD);
             mapUnits = state.getInt(MAPUNITS_FIELD);;
             viewDocument = (ViewDocument) state.get(VIEW_FIELD);
             if (state.hasValue(HAS_TOC)) {
             	this.b_hasToc = state.getBoolean(HAS_TOC);
+            }
             if (viewDocument!=null) {
             	this.setView(viewDocument);
             	// it is crucial to don't persist the MapContext and get a cloned one from the View instead,
             	// as the cloned instance is different from the one created using persistence. In particular,
             	// the cloned one will share the EventBuffer with the original one, while persistence would
             	// create 2 separate EventBuffers, which will then have a very stange behaviour
+            }
             if (getMapContext()!=null) {
             	double mapScale = state.getDouble(SCALE_FIELD);
             	getMapContext().setScaleView((long)mapScale); // FIXME: really needed?? probably already persisted on Mapcontext
             	getMapContext().getViewPort().setEnvelope(
                     (Envelope) state.get(ENVELOPE_FIELD));
             	if (this.getLayoutContext()!=null) {
             		this.getLayoutContext().setTocModel(getMapContext());
+            	}
             if (state.hasValue(MAPCONTEXT_FIELD)) {
                 MapContext mctxt = (MapContext) state.get(MAPCONTEXT_FIELD);
                 this.setViewMapContext(mctxt);
                 double mapScale = state.getDouble(SCALE_FIELD);
                 mapContext.getViewPort().setDPI(getDrawPaperDPI());
                 mapContext.setScaleView((long)mapScale); // FIXME: really needed?? probably already persisted on Mapcontext
                 mapContext.getViewPort().setEnvelope(
                     (Envelope) state.get(ENVELOPE_FIELD));
                 if (state.hasValue(HAS_TOC)) {
                 	this.b_hasToc = state.getBoolean(HAS_TOC);
                 	if (this.getLayoutContext()!=null) {
                 		this.getLayoutContext().setTocModel(mapContext);
+                	}
+                }
+            }
             showGrid = state.getBoolean(SHOWGRID_FIELD);
             grid = (IFFrame) state.get(GRID_FIELD);
+        }
-...
                 state.set(ENVELOPE_FIELD, getMapContext().getViewPort()
                     .getEnvelope());
                 state.set(SCALE_FIELD, (double)getMapContext().getScaleView());
                 state.set(MAPCONTEXT_FIELD, getMapContext());
+            }
             state.set(SHOWGRID_FIELD, showGrid);
-...
     	protected void invalidateToc() {
     		if (getLayoutContext()!=null) {
     			getLayoutContext().updateFFrames();
     			getLayoutContext().notifyTocUpdated(TocModelChangedNotification.Type.MODEL_CHANGED);
+    		}
+    	}
     	public void refresh() {
-...
     		public void visibilityChanged(LayerCollectionEvent e)
     				throws CancelationException {
     			// this event is not being received, maybe is only triggered if the
     			// visibility of the whole group changes??
     			conditionalRedraw();
     			invalidateToc();
+    		}
-...
+    	}
     	private class OwnMapContextListener
     	implements ViewPortListener, LegendListener, LayerCollectionListener {
     		implements ViewPortListener, LegendListener, LayerCollectionListener {
     		public void extentChanged(ExtentEvent e) {
     			if (!b_viewOriginatedUpdate && (getTypeScale() == AUTOMATICO)) {
-...
     		public void legendChanged(final LegendChangedEvent e) {
     			conditionalRedraw();
     			invalidateToc();
+    		}
     		public void layerAdded(final LayerCollectionEvent e) {
     			conditionalRedraw();
     			invalidateToc();
+    		}
     		public void layerMoved(final LayerPositionEvent e) {
     			conditionalRedraw();
     			invalidateToc();
+    		}
     		public void layerRemoved(final LayerCollectionEvent e) {
     			conditionalRedraw();
     			invalidateToc();
+    		}
     		public void layerAdding(LayerCollectionEvent e)

     import java.awt.BorderLayout;
     import java.awt.Component;
     import java.awt.Graphics2D;
     import java.awt.event.MouseEvent;
     import java.awt.event.MouseListener;
     import java.awt.geom.AffineTransform;
     import java.awt.print.PageFormat;
     import java.awt.print.Printable;
-...
     				public void tocUpdated(Object observable,
     						TocModelChangedNotification notification) {
     					if (TocModelChangedNotification.MODEL_CHANGED==notification.getType()) {
     					if (TocModelChangedNotification.Type.MODEL_CHANGED==notification.getType()) {
     						if (DefaultLayoutPanel.this.toc!=null){
     							DefaultLayoutPanel.this.toc.refresh();
+    						}
+    					}
     					else if (TocModelChangedNotification.MODEL_SET==notification.getType()) {
     					else if (TocModelChangedNotification.Type.MODEL_SET==notification.getType()) {
     						MapContext mapContext = notification.getModel();
     						if (mapContext!=null) {
     							createToc();

Application: gvSIG desktop » gvSIG Document Layout

Revision 168