diff --git a/plugins/org.locationtech.udig.project/src/org/locationtech/udig/project/internal/impl/InitMapBoundsInterceptor.java b/plugins/org.locationtech.udig.project/src/org/locationtech/udig/project/internal/impl/InitMapBoundsInterceptor.java index 9976822ed..91a910adf 100644 --- a/plugins/org.locationtech.udig.project/src/org/locationtech/udig/project/internal/impl/InitMapBoundsInterceptor.java +++ b/plugins/org.locationtech.udig.project/src/org/locationtech/udig/project/internal/impl/InitMapBoundsInterceptor.java @@ -1,4 +1,5 @@ -/* uDig - User Friendly Desktop Internet GIS client +/** + * uDig - User Friendly Desktop Internet GIS client * http://udig.refractions.net * (C) 2004, Refractions Research Inc. * @@ -9,37 +10,37 @@ */ package org.locationtech.udig.project.internal.impl; +import org.geotools.geometry.jts.ReferencedEnvelope; import org.locationtech.udig.project.interceptor.LayerInterceptor; import org.locationtech.udig.project.internal.Layer; import org.locationtech.udig.project.internal.Map; -import org.locationtech.udig.project.internal.render.ViewportModel; import org.locationtech.udig.project.internal.render.impl.ViewportModelImpl; import org.locationtech.udig.ui.ProgressManager; -import org.geotools.geometry.jts.ReferencedEnvelope; - /** * If first layer it sets the viewport bounds to be the bounds of the layer. - * + * * @author jesse * @since 1.1.0 */ public class InitMapBoundsInterceptor implements LayerInterceptor { - public void run( Layer layer ) { - if(layer.getMap()==null ){ + @Override + public void run(Layer layer) { + if (layer.getMap() == null) { // this check is here because we could be doing a copy return; } - if(layer.getMap().getProject() == null) { - // this check is here because we are probably loading - return; + if (layer.getMap().getProject() == null) { + // this check is here because we are probably loading + return; } Map map = layer.getMapInternal(); ReferencedEnvelope bounds = map.getViewportModelInternal().getBounds(); - // If first layer or if the crs has been unchanged from the original BBox - if( map.getMapLayers().size()==1 || bounds == ViewportModelImpl.getDefaultReferencedEnvelope()){ + // If first layer or if the CRS has been unchanged from the original BBox + if (map.getMapLayers().size() == 1 + || bounds == ViewportModelImpl.getDefaultReferencedEnvelope()) { bounds = map.getBounds(ProgressManager.instance().get()); map.getViewportModelInternal().setBounds(bounds); } diff --git a/plugins/org.locationtech.udig.project/src/org/locationtech/udig/project/internal/impl/MapImpl.java b/plugins/org.locationtech.udig.project/src/org/locationtech/udig/project/internal/impl/MapImpl.java index 4353d7827..76f00ff3c 100644 --- a/plugins/org.locationtech.udig.project/src/org/locationtech/udig/project/internal/impl/MapImpl.java +++ b/plugins/org.locationtech.udig.project/src/org/locationtech/udig/project/internal/impl/MapImpl.java @@ -1,4 +1,5 @@ -/* uDig - User Friendly Desktop Internet GIS client +/** + * uDig - User Friendly Desktop Internet GIS client * http://udig.refractions.net * (C) 2004-2012, Refractions Research Inc. * @@ -122,9 +123,9 @@ public class MapImpl extends EObjectImpl implements Map { private static final String ERROR_EXECUTING_COMMAND = "Error executing command: "; /** - * The default value of the '{@link #getName() Name}' attribute. - * + * * @see #getName() * @generated NOT * @ordered @@ -132,9 +133,9 @@ public class MapImpl extends EObjectImpl implements Map { protected static final String NAME_EDEFAULT = ""; /** - * The cached value of the '{@link #getName() Name}' attribute. - * + * The cached value of the '{@link #getName() Name}' attribute. + * + * * @see #getName() * @generated NOT * @ordered @@ -144,6 +145,7 @@ public class MapImpl extends EObjectImpl implements Map { /** * The cached value of the '{@link #getProjectInternal() Project Internal}' reference. * + * * @see #getProjectInternal() * @generated not * @ordered @@ -151,8 +153,9 @@ public class MapImpl extends EObjectImpl implements Map { protected volatile Project projectInternal = null; /** - * The cached value of the '{@link #getContextModel() Context Model}' containment reference. - * + * The cached value of the '{@link #getContextModel() Context Model}' containment + * reference. + * * @see #getContextModel() * @generated not * @ordered @@ -180,8 +183,9 @@ public class MapImpl extends EObjectImpl implements Map { protected volatile String abstract_ = ABSTRACT_EDEFAULT; /** - * The default value of the '{@link #getNavCommandStack() Nav Command Stack}' attribute. - * + * The default value of the '{@link #getNavCommandStack() Nav Command Stack}' + * attribute. + * * @see #getNavCommandStack() * @generated * @ordered @@ -189,8 +193,9 @@ public class MapImpl extends EObjectImpl implements Map { protected static final NavCommandStack NAV_COMMAND_STACK_EDEFAULT = null; /** - * The default value of the '{@link #getCommandStack() Command Stack}' attribute. - * + * The default value of the '{@link #getCommandStack() Command Stack}' attribute. + * * @see #getCommandStack() * @generated * @ordered @@ -198,8 +203,9 @@ public class MapImpl extends EObjectImpl implements Map { protected static final CommandStack COMMAND_STACK_EDEFAULT = null; /** - * The cached value of the '{@link #getLayerFactory() Layer Factory}' containment reference. - * + * The cached value of the '{@link #getLayerFactory() Layer Factory}' containment + * reference. + * * @see #getLayerFactory() * @generated not * @ordered @@ -207,8 +213,9 @@ public class MapImpl extends EObjectImpl implements Map { protected volatile LayerFactory layerFactory = null; /** - * The cached value of the '{@link #getViewportModelInternal() Viewport Model Internal}' containment reference. - * + * The cached value of the '{@link #getViewportModelInternal() Viewport Model + * Internal}' containment reference. + * * @see #getViewportModelInternal() * @generated not * @ordered @@ -216,8 +223,8 @@ public class MapImpl extends EObjectImpl implements Map { protected volatile ViewportModel viewportModelInternal = null; /** - * The default value of the '{@link #getColorPalette() Color Palette}' attribute. - * + * The default value of the '{@link #getColorPalette() Color Palette}' attribute. * * @see #getColorPalette() * @generated NOT @@ -236,8 +243,9 @@ public class MapImpl extends EObjectImpl implements Map { protected volatile BrewerPalette colorPalette = null; /** - * The cached value of the '{@link #getEditManagerInternal() Edit Manager Internal}' containment reference. - * + * The cached value of the '{@link #getEditManagerInternal() Edit Manager Internal}' + * containment reference. + * * @see #getEditManagerInternal() * @generated not * @ordered @@ -245,8 +253,9 @@ public class MapImpl extends EObjectImpl implements Map { protected volatile EditManager editManagerInternal = null; /** - * The cached value of the '{@link #getRenderManagerInternal() Render Manager Internal}' reference. - * + * The cached value of the '{@link #getRenderManagerInternal() Render Manager + * Internal}' reference. + * * @see #getRenderManagerInternal() * @generated not * @ordered @@ -254,8 +263,8 @@ public class MapImpl extends EObjectImpl implements Map { protected volatile RenderManager renderManagerInternal = null; /** - * The default value of the '{@link #getColourScheme() Colour Scheme}' attribute. - * + * The default value of the '{@link #getColourScheme() Colour Scheme}' attribute. * * @see #getColourScheme() * @generated NOT @@ -276,8 +285,9 @@ public class MapImpl extends EObjectImpl implements Map { protected volatile ColourScheme colourScheme = null; /** - * The cached value of the '{@link #getBlackBoardInternal() Black Board Internal}' containment reference. - * + * The cached value of the '{@link #getBlackBoardInternal() Black Board Internal}' + * containment reference. + * * @see #getBlackBoardInternal() * @generated not * @ordered @@ -286,8 +296,8 @@ public class MapImpl extends EObjectImpl implements Map { /** * The cached value of the '{@link #getLegend() Legend}' containment reference list. - * - * + * + * * @see #getLegend() * @generated * @ordered @@ -319,6 +329,7 @@ private void addMapListenerAdapter() { /** * + * * @generated */ @Override @@ -350,6 +361,7 @@ public Project getProjectInternal() { /** * + * * @generated */ public Project getProjectInternalGen() { @@ -368,6 +380,7 @@ public Project getProjectInternalGen() { /** * + * * @generated */ public Project basicGetProjectInternal() { @@ -376,6 +389,7 @@ public Project basicGetProjectInternal() { /** * + * * @generated */ public NotificationChain basicSetProjectInternal(Project newProjectInternal, @@ -395,6 +409,7 @@ public NotificationChain basicSetProjectInternal(Project newProjectInternal, /** * + * * @generated NOT */ @Override @@ -440,6 +455,7 @@ public ContextModel getContextModel() { /** * + * * @generated */ @SuppressWarnings("deprecation") @@ -461,9 +477,6 @@ public NotificationChain basicSetContextModel(ContextModel newContextModel, final ContextModelListenerAdapter contextModelListener = new EMFCompositionEventToMapCompositionEventListener( this); - /** - * @see org.locationtech.udig.project.internal.Map#setContextModel(org.locationtech.udig.project.ContextModel) - */ @Override @SuppressWarnings({ "deprecation" }) public void setContextModel(ContextModel newContextModel) { @@ -511,6 +524,7 @@ public ViewportModel getViewportModelInternal() { /** * + * * @generated */ public NotificationChain basicSetViewportModelInternal(ViewportModel newViewportModelInternal, @@ -545,6 +559,7 @@ public void setViewportModelInternal(ViewportModel newViewportModelInternal) { /** * + * * @generated */ public void setViewportModelInternalGen(ViewportModel newViewportModelInternal) { @@ -567,6 +582,7 @@ public void setViewportModelInternalGen(ViewportModel newViewportModelInternal) /** * + * * @generated NOT */ @Override @@ -575,7 +591,7 @@ public BrewerPalette getColorPalette() { String defaultPalette = ProjectPlugin.getPlugin().getPreferenceStore() .getString(PreferenceConstants.P_DEFAULT_PALETTE); if (defaultPalette == null || !PlatformGIS.getColorBrewer().hasPalette(defaultPalette)) - defaultPalette = "Dark2"; //failsafe default //$NON-NLS-1$ + defaultPalette = "Dark2"; // failsafe default //$NON-NLS-1$ colorPalette = PlatformGIS.getColorBrewer().getPalette(defaultPalette); } return colorPalette; @@ -583,6 +599,7 @@ public BrewerPalette getColorPalette() { /** * + * * @generated */ @Override @@ -596,6 +613,7 @@ public void setColorPalette(BrewerPalette newColorPalette) { /** * + * * @generated */ @Override @@ -605,6 +623,7 @@ public String getAbstract() { /** * + * * @generated */ @Override @@ -618,6 +637,7 @@ public void setAbstract(String newAbstract) { /** * + * * @generated */ @Override @@ -627,6 +647,7 @@ public String getName() { /** * + * * @generated */ @Override @@ -686,7 +707,8 @@ private ReferencedEnvelope getDefaultBounds() { } /** - * Takes an Extent, usually from a {@link CoordinateReferenceSystem}, and converts it to a ReferencedEnvelope + * Takes an Extent, usually from a {@link CoordinateReferenceSystem}, and converts it to a + * ReferencedEnvelope * * @param extent the extent to convert. * @param crs the desired CRS of the ReferencedEnvelope. @@ -806,6 +828,7 @@ public LayerFactory getLayerFactory() { /** * + * * @generated */ public NotificationChain basicSetLayerFactory(LayerFactory newLayerFactory, @@ -825,6 +848,7 @@ public NotificationChain basicSetLayerFactory(LayerFactory newLayerFactory, /** * + * * @generated */ @Override @@ -937,9 +961,6 @@ public BatchNotification(MapImpl notifier, int eventType, int featureid) { List notifications = new ArrayList<>(); - /** - * @see org.eclipse.emf.common.notify.impl.NotificationImpl#add(org.eclipse.emf.common.notify.Notification) - */ @Override public boolean add(Notification newNotification) { if (notifications.contains(newNotification)) @@ -959,9 +980,6 @@ public int compare(Notification o1, Notification o2) { return true; } - /** - * @see java.lang.Iterable#iterator() - */ @Override public Iterator iterator() { return notifications.iterator(); @@ -1020,8 +1038,8 @@ public void forwardHistory() { } /** - * - * + * + * * @generated */ @Override @@ -1065,8 +1083,8 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, } /** - * - * + * + * * @generated */ @Override @@ -1094,8 +1112,8 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, } /** - * - * + * + * * @generated */ @Override @@ -1138,8 +1156,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { } /** - * - * + * + * * @generated */ @SuppressWarnings("unchecked") @@ -1188,8 +1206,8 @@ public void eSet(int featureID, Object newValue) { } /** - * - * + * + * * @generated */ @Override @@ -1236,8 +1254,8 @@ public void eUnset(int featureID) { } /** - * - * + * + * * @generated */ @Override @@ -1296,6 +1314,7 @@ public EditManager getEditManagerInternal() { /** * + * * @generated */ public NotificationChain basicSetEditManagerInternal(EditManager newEditManagerInternal, @@ -1316,6 +1335,7 @@ public NotificationChain basicSetEditManagerInternal(EditManager newEditManagerI /** * + * * @generated */ @Override @@ -1339,6 +1359,7 @@ public void setEditManagerInternal(EditManager newEditManagerInternal) { /** * + * * @generated */ @Override @@ -1358,6 +1379,7 @@ public RenderManager getRenderManagerInternal() { /** * + * * @generated */ public RenderManager basicGetRenderManagerInternal() { @@ -1366,6 +1388,7 @@ public RenderManager basicGetRenderManagerInternal() { /** * + * * @generated */ public NotificationChain basicSetRenderManagerInternal(RenderManager newRenderManagerInternal, @@ -1386,6 +1409,7 @@ public NotificationChain basicSetRenderManagerInternal(RenderManager newRenderMa /** * + * * @generated */ public void setRenderManagerInternalGen(RenderManager newRenderManagerInternal) { @@ -1407,13 +1431,10 @@ public void setRenderManagerInternalGen(RenderManager newRenderManagerInternal) } Adapter adapter = new AdapterImpl() { - /** - * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification) - */ @Override public void notifyChanged(Notification msg) { switch (msg.getFeatureID(RenderManager.class)) { - case RenderPackage.RENDER_MANAGER__VIEWPORT_MODEL_INTERNAL: { + case RenderPackage.RENDER_MANAGER__VIEWPORT_MODEL_INTERNAL: if (msg.getEventType() == Notification.ADD) { if (getViewportModel() != msg.getNewValue()) { setViewportModelInternal((ViewportModel) msg.getNewValue()); @@ -1421,22 +1442,24 @@ public void notifyChanged(Notification msg) { } break; } - } switch (msg.getFeatureID(ViewportModel.class)) { - case RenderPackage.VIEWPORT_MODEL__RENDER_MANAGER_INTERNAL: { + case RenderPackage.VIEWPORT_MODEL__RENDER_MANAGER_INTERNAL: if (msg.getEventType() == Notification.ADD) { if (getRenderManager() != msg.getNewValue()) { setRenderManagerInternal((RenderManager) msg.getNewValue()); } } break; - } + case RenderPackage.VIEWPORT_MODEL__BOUNDS: + if (msg.getNotifier() == viewportModelInternal && eResource() != null) { + eResource().setModified(true); + } + break; } } }; /** - * @see org.locationtech.udig.project.internal.Map#setRenderManager(org.locationtech.udig.project.render.RenderManager) * @uml.property name="renderManagerInternal" */ @Override @@ -1451,6 +1474,7 @@ public void setRenderManagerInternal(RenderManager newRenderManager) { /** * + * * @generated NOT */ @Override @@ -1463,6 +1487,7 @@ public ColourScheme getColourScheme() { /** * + * * @generated */ @Override @@ -1474,11 +1499,6 @@ public void setColourScheme(ColourScheme newColourScheme) { oldColourScheme, colourScheme)); } - /* - * (non-Javadoc) - * - * @see org.locationtech.udig.project.IMap#getBlackboard() - */ @Override public IBlackboard getBlackboard() { return getBlackBoardInternal(); @@ -1486,6 +1506,7 @@ public IBlackboard getBlackboard() { /** * + * * @generated */ @Override @@ -1495,6 +1516,7 @@ public Blackboard getBlackBoardInternal() { /** * + * * @generated */ public NotificationChain basicSetBlackBoardInternal(Blackboard newBlackBoardInternal, @@ -1515,6 +1537,7 @@ public NotificationChain basicSetBlackBoardInternal(Blackboard newBlackBoardInte /** * + * * @generated */ @Override @@ -1539,8 +1562,8 @@ public void setBlackBoardInternal(Blackboard newBlackBoardInternal) { } /** - * - * + * + * * @generated */ @Override @@ -1554,6 +1577,7 @@ public List getLegend() { /** * + * * @generated */ @Override @@ -1574,9 +1598,6 @@ public String toString() { return result.toString(); } - /** - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - */ @Override @SuppressWarnings("unchecked") public Object getAdapter(Class adapter) { @@ -1586,10 +1607,10 @@ public Object getAdapter(Class adapter) { return o; } - /* - * Adapt to an IWorkbenchAdapter. Other aspects of Eclipse can read the - * properties we provide access to. (example: Property page dialogs - * can read the label and display that in their title.) + /** + * Adapt to an IWorkbenchAdapter. Other aspects of Eclipse can read the properties we + * provide access to. (example: Property page dialogs can read the label and display that in + * their title.) */ if (adapter.isAssignableFrom(IWorkbenchAdapter.class)) { return new WorkbenchAdapter() { @@ -1605,41 +1626,26 @@ public String getLabel(Object object) { return Platform.getAdapterManager().getAdapter(this, adapter); } - /** - * @see org.locationtech.udig.project.IProjectElement#getProject() - */ @Override public IProject getProject() { return getProjectInternal(); } - /** - * @see org.locationtech.udig.project.IMap#getViewportModel() - */ @Override public IViewportModel getViewportModel() { return getViewportModelInternal(); } - /** - * @see org.locationtech.udig.project.IMap#getEditManager() - */ @Override public IEditManager getEditManager() { return getEditManagerInternal(); } - /** - * @see org.locationtech.udig.project.IMap#getRenderManager() - */ @Override public IRenderManager getRenderManager() { return getRenderManagerInternal(); } - /** - * @see org.locationtech.udig.project.IMap#getMapLayers() - */ @Override @SuppressWarnings("unchecked") public List getMapLayers() { @@ -1899,7 +1905,6 @@ public void select(Envelope boundingBox, boolean add) { } /** - * @see org.locationtech.udig.project.internal.ContextModel#select(Filter) * @generated NOT */ @Override @@ -1915,7 +1920,6 @@ public void select(Filter filter) { } /** - * @see org.locationtech.udig.project.internal.ContextModel#select(Filter, boolean) * @generated NOT */ @Override diff --git a/plugins/org.locationtech.udig.project/src/org/locationtech/udig/project/internal/impl/ProjectImpl.java b/plugins/org.locationtech.udig.project/src/org/locationtech/udig/project/internal/impl/ProjectImpl.java index 6e06e185f..5a00c7c6a 100644 --- a/plugins/org.locationtech.udig.project/src/org/locationtech/udig/project/internal/impl/ProjectImpl.java +++ b/plugins/org.locationtech.udig.project/src/org/locationtech/udig/project/internal/impl/ProjectImpl.java @@ -307,9 +307,6 @@ public String toString() { CommandManager commandManager; - /** - * @see org.locationtech.udig.project.IProject#getElements() - */ @Override @SuppressWarnings("unchecked") public List getElements() { @@ -423,7 +420,8 @@ private static URI createNewResource(Resource projectResource, String projectPat URI normalizedURI = uriConverter.normalize(uri); for (Resource resource2 : list) { - if (uriConverter.normalize(resource2.getURI()).equals(normalizedURI)) { + if (resource2 != null + && uriConverter.normalize(resource2.getURI()).equals(normalizedURI)) { found = true; break; }