[JPP-Devel] Indention WAS:Re: SVN: [5592] core/trunk/src/org/openjump/core/ui/plugin/wms/ AddWmsLayerWizard.java

2017-11-28 Thread edgar . soldin 
Peppe,

you reformatted a whole class, which did not have any formatting issues. please 
refrain from doing that in favour of enabling others spotting your changes.

btw. didn't we negotiate
- spaces only
- indention is two spaces
- reformatting only if the whole file is a big indention mess (tabs/spaces, 
bigger/smaller indention) that cannot be dealt w/ manually
in the past for OJ?

..ede


On 28.11.2017 16:01, jump-pilot-svn--- via Jump-pilot-devel wrote:
> Revision: 5592
>   http://sourceforge.net/p/jump-pilot/code/5592
> Author:   ma15569
> Date: 2017-11-28 15:01:34 + (Tue, 28 Nov 2017)
> Log Message:
> ---
> Small upgrade WMS URLs
> 
> Modified Paths:
> --
> core/trunk/src/org/openjump/core/ui/plugin/wms/AddWmsLayerWizard.java
> 
> Modified: 
> core/trunk/src/org/openjump/core/ui/plugin/wms/AddWmsLayerWizard.java
> ===
> --- core/trunk/src/org/openjump/core/ui/plugin/wms/AddWmsLayerWizard.java 
> 2017-11-28 13:25:04 UTC (rev 5591)
> +++ core/trunk/src/org/openjump/core/ui/plugin/wms/AddWmsLayerWizard.java 
> 2017-11-28 15:01:34 UTC (rev 5592)
> @@ -1,5 +1,13 @@
>  package org.openjump.core.ui.plugin.wms;
>  
> +import java.io.IOException;
> +import java.util.ArrayList;
> +import java.util.Collection;
> +import java.util.List;
> +
> +import org.openjump.core.ui.plugin.file.open.ChooseProjectPanel;
> +import org.openjump.core.ui.swing.wizard.AbstractWizardGroup;
> +
>  import com.vividsolutions.jump.I18N;
>  import com.vividsolutions.jump.task.TaskMonitor;
>  import com.vividsolutions.jump.workbench.WorkbenchContext;
> @@ -18,125 +26,136 @@
>  import com.vividsolutions.jump.workbench.ui.wizard.WizardDialog;
>  import com.vividsolutions.wms.MapLayer;
>  import com.vividsolutions.wms.WMService;
> -import org.openjump.core.ui.plugin.file.open.ChooseProjectPanel;
> -import org.openjump.core.ui.swing.wizard.AbstractWizardGroup;
>  
> -import java.io.IOException;
> -import java.util.ArrayList;
> -import java.util.Collection;
> -import java.util.List;
> -
>  public class AddWmsLayerWizard extends AbstractWizardGroup {
> -
> -  public static final String CACHED_URL_KEY = "AddWMSQueryPlugin.CACHED_URL";
>  
> -  public static final String KEY = AddWmsLayerWizard.class.getName();
> +public static final String CACHED_URL_KEY = 
> "AddWMSQueryPlugin.CACHED_URL";
>  
> -  private WorkbenchContext workbenchContext;
> +public static final String KEY = AddWmsLayerWizard.class.getName();
>  
> -  public static final String[] DEFAULT_URLS = new String[] {
> -"http://deegree3-demo.deegree.org/utah-workspace/services";,
> -"http://demo.opengeo.org/geoserver/wms";,
> -//"http://wiki.openstreetmap.org/wiki/WMS";, // does not work (missing 
> WMT_MS_Capabilities)
> -//"http://openaerialmap.org/wms/";,  // does not work (2013-06-09)
> -"http://wms.jpl.nasa.gov/wms.cgi";,
> -//"http://wms.latlon.org/?";,// does not work (missing 
> WMT_MS_Capabilities)
> -"http://ows.terrestris.de/osm/service";,
> -"http://maps.omniscale.net/wms/demo/default/service";,
> -// addresses added on 2013-06-19
> -"http://www2.demis.nl/WMS/wms.ashx?wms=WorldMap";,
> -
> "http://gridca.grid.unep.ch/cgi-bin/mapserv?map=/www/geodataportal/htdocs/mod_map/geo_wms.map&";,
> -"http://demo.mapserver.org/cgi-bin/wms";,
> -
> "http://wms.pcn.minambiente.it/ogc?map=/ms_ogc/WMS_v1.3/raster/ortofoto_colore_06.map&";,
> +private WorkbenchContext workbenchContext;
>  
> -  };
> +public static final String[] DEFAULT_URLS = new String[] {
> +"http://deegree3-demo.deegree.org/utah-workspace/services";,
> +"http://demo.opengeo.org/geoserver/wms";,
> +// "http://wiki.openstreetmap.org/wiki/WMS";, // does not work
> +// (missing WMT_MS_Capabilities)
> +// "http://openaerialmap.org/wms/";, // does not work (2013-06-09)
> +"http://wms.jpl.nasa.gov/wms.cgi";,
> +// "http://wms.latlon.org/?";, // does not work (missing
> +// WMT_MS_Capabilities)
> +"http://ows.terrestris.de/osm/service";,
> +"http://maps.omniscale.net/wms/demo/default/service";,
> +// addresses added on 2013-06-19
> +"http://www2.demis.nl/WMS/wms.ashx?wms=WorldMap";,
> +
> "http://gridca.grid.unep.ch/cgi-bin/mapserv?map=/www/geodataportal/htdocs/mod_map/geo_wms.map&";,
> +"http://demo.mapserver.org/cgi-bin/wms";,
>  
> -  private String lastWMSVersion = WMService.WMS_1_1_1;
> +// 
> "http://wms.pcn.minambiente.it/ogc?map=/ms_ogc/WMS_v1.3/raster/ortofoto_colore_06.map&";
> +// //does not work
> +
> "http://wms.pcn.minambiente.it/ogc?map=/ms_ogc/WMS_v1.3/raster/ortofoto_colore_12.map&service=wms&request=getCapabilities&version=1.3.0&";,
> +
> "https://www.gebco.net/data_and_products/gebco_web_s

Re: [JPP-Devel] Indention WAS:Re: SVN: [5592] core/trunk/src/org/openjump/core/ui/plugin/wms/ AddWmsLayerWizard.java

2017-11-29 Thread Giuseppe Aruta 
Hey Ede
I don't know what happened form my side.
I substituded/added the url codes and save the class (no copy/paste from
another class, no substituting the whole code).
I will check any anyhow on my side.

regarding the other points
- spaces only
- indention is two spaces
could it be alreay the formatting of the original code?

thanks to recover it.
Peppe


2017-11-28 17:12 GMT+01:00 :

> Peppe,
>
> you reformatted a whole class, which did not have any formatting issues.
> please refrain from doing that in favour of enabling others spotting your
> changes.
>
> btw. didn't we negotiate
> - spaces only
> - indention is two spaces
> - reformatting only if the whole file is a big indention mess
> (tabs/spaces, bigger/smaller indention) that cannot be dealt w/ manually
> in the past for OJ?
>
> ..ede
>
>
> On 28.11.2017 16:01, jump-pilot-svn--- via Jump-pilot-devel wrote:
> > Revision: 5592
> >   http://sourceforge.net/p/jump-pilot/code/5592
> > Author:   ma15569
> > Date: 2017-11-28 15:01:34 + (Tue, 28 Nov 2017)
> > Log Message:
> > ---
> > Small upgrade WMS URLs
> >
> > Modified Paths:
> > --
> > core/trunk/src/org/openjump/core/ui/plugin/wms/
> AddWmsLayerWizard.java
> >
> > Modified: core/trunk/src/org/openjump/core/ui/plugin/wms/
> AddWmsLayerWizard.java
> > ===
> > --- core/trunk/src/org/openjump/core/ui/plugin/wms/AddWmsLayerWizard.java
>2017-11-28 13:25:04 UTC (rev 5591)
> > +++ core/trunk/src/org/openjump/core/ui/plugin/wms/AddWmsLayerWizard.java
>2017-11-28 15:01:34 UTC (rev 5592)
> > @@ -1,5 +1,13 @@
> >  package org.openjump.core.ui.plugin.wms;
> >
> > +import java.io.IOException;
> > +import java.util.ArrayList;
> > +import java.util.Collection;
> > +import java.util.List;
> > +
> > +import org.openjump.core.ui.plugin.file.open.ChooseProjectPanel;
> > +import org.openjump.core.ui.swing.wizard.AbstractWizardGroup;
> > +
> >  import com.vividsolutions.jump.I18N;
> >  import com.vividsolutions.jump.task.TaskMonitor;
> >  import com.vividsolutions.jump.workbench.WorkbenchContext;
> > @@ -18,125 +26,136 @@
> >  import com.vividsolutions.jump.workbench.ui.wizard.WizardDialog;
> >  import com.vividsolutions.wms.MapLayer;
> >  import com.vividsolutions.wms.WMService;
> > -import org.openjump.core.ui.plugin.file.open.ChooseProjectPanel;
> > -import org.openjump.core.ui.swing.wizard.AbstractWizardGroup;
> >
> > -import java.io.IOException;
> > -import java.util.ArrayList;
> > -import java.util.Collection;
> > -import java.util.List;
> > -
> >  public class AddWmsLayerWizard extends AbstractWizardGroup {
> > -
> > -  public static final String CACHED_URL_KEY =
> "AddWMSQueryPlugin.CACHED_URL";
> >
> > -  public static final String KEY = AddWmsLayerWizard.class.getName();
> > +public static final String CACHED_URL_KEY =
> "AddWMSQueryPlugin.CACHED_URL";
> >
> > -  private WorkbenchContext workbenchContext;
> > +public static final String KEY = AddWmsLayerWizard.class.getName();
> >
> > -  public static final String[] DEFAULT_URLS = new String[] {
> > -"http://deegree3-demo.deegree.org/utah-workspace/services";,
> > -"http://demo.opengeo.org/geoserver/wms";,
> > -//"http://wiki.openstreetmap.org/wiki/WMS";, // does not work
> (missing WMT_MS_Capabilities)
> > -//"http://openaerialmap.org/wms/";,  // does not work
> (2013-06-09)
> > -"http://wms.jpl.nasa.gov/wms.cgi";,
> > -//"http://wms.latlon.org/?";,// does not work
> (missing WMT_MS_Capabilities)
> > -"http://ows.terrestris.de/osm/service";,
> > -"http://maps.omniscale.net/wms/demo/default/service";,
> > -// addresses added on 2013-06-19
> > -"http://www2.demis.nl/WMS/wms.ashx?wms=WorldMap";,
> > -"http://gridca.grid.unep.ch/cgi-bin/mapserv?map=/www/
> geodataportal/htdocs/mod_map/geo_wms.map&",
> > -"http://demo.mapserver.org/cgi-bin/wms";,
> > -"http://wms.pcn.minambiente.it/ogc?map=/ms_ogc/WMS_v1.3/
> raster/ortofoto_colore_06.map&",
> > +private WorkbenchContext workbenchContext;
> >
> > -  };
> > +public static final String[] DEFAULT_URLS = new String[] {
> > +"http://deegree3-demo.deegree.org/utah-workspace/services";,
> > +"http://demo.opengeo.org/geoserver/wms";,
> > +// "http://wiki.openstreetmap.org/wiki/WMS";, // does not
> work
> > +// (missing WMT_MS_Capabilities)
> > +// "http://openaerialmap.org/wms/";, // does not work
> (2013-06-09)
> > +"http://wms.jpl.nasa.gov/wms.cgi";,
> > +// "http://wms.latlon.org/?";, // does not work (missing
> > +// WMT_MS_Capabilities)
> > +"http://ows.terrestris.de/osm/service";,
> > +"http://maps.omniscale.net/wms/demo/default/service";,
> > +// addresses added on 2013-06-19
> > +"http://www2.demis.nl/WMS/wms.ashx?wms=WorldMap";,
> > +"http://gridca.grid.unep

Re: [JPP-Devel] Indention WAS:Re: SVN: [5592] core/trunk/src/org/openjump/core/ui/plugin/wms/ AddWmsLayerWizard.java

2017-11-29 Thread edgar . soldin 
Peppe,

"
> could it be alreay the formatting of the original code?
"

what do you mean by that?.. ede

On 29.11.2017 12:35, Giuseppe Aruta wrote:
> Hey Ede
> I don't know what happened form my side.
> I substituded/added the url codes and save the class (no copy/paste from 
> another class, no substituting the whole code).
> I will check any anyhow on my side.
> 
> regarding the other points
> - spaces only
> - indention is two spaces
> could it be alreay the formatting of the original code?
> 
> thanks to recover it.
> Peppe
> 
> 
> 2017-11-28 17:12 GMT+01:00 mailto:edgar.sol...@web.de>>:
> 
> Peppe,
> 
> you reformatted a whole class, which did not have any formatting issues. 
> please refrain from doing that in favour of enabling others spotting your 
> changes.
> 
> btw. didn't we negotiate
> - spaces only
> - indention is two spaces
> - reformatting only if the whole file is a big indention mess 
> (tabs/spaces, bigger/smaller indention) that cannot be dealt w/ manually
> in the past for OJ?
> 
> ..ede
> 
SNIP

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel