/ - Diff - gvSIG data provider for OpenStreetMap (raster) - gvSIG

     import javax.swing.BorderFactory;
     import javax.swing.JButton;
     import javax.swing.JComponent;
     import javax.swing.JLabel;
     import javax.swing.JOptionPane;
     import javax.swing.JPanel;
     import javax.swing.JScrollPane;
-...
     import org.gvsig.i18n.Messages;
     import org.gvsig.raster.osm.swing.AddOSMLayerPanel;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.i18n.I18nManager;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
-...
     	private JTable               tableServerList     = null;
     	private String               propertiesFileName  = "osmservers.properties";
     	private JPanel               buttonsPanel        = null;
         private JPanel               crsWarningPanel     = null;
     	private JPanel               selectedServerPanel = null;
     	private String[]             columnNames         = null;
     	private JButton              addServerButton     = null;
-...
     	private JButton              removeServerButton  = null;
     	private AddServerPanel       serverPanel         = null;
     	private MouseListener        mouseListener       = null;
         private JLabel               crsWarningLabel     = null;
         private boolean              showCrsWarning      = false;
     	public AddOSMLayerPanelImpl(File pathToServerList) {
     		if(pathToServerList != null)
     			this.pathToServerList = pathToServerList;
     		else
     			this.pathToServerList = new File(System.getProperty("user.home"));
     		columnNames = new String[]{
     			Messages.getText("name"),
     			Messages.getText("url"),
     			Messages.getText("levels"),
     			Messages.getText("format"),};
     		init();
+    	}
         public AddOSMLayerPanelImpl(File pathToServerList) {
             this(pathToServerList, false);
+        }
         public AddOSMLayerPanelImpl(File pathToServerList, boolean showCrsWarning) {
             if (pathToServerList != null) {
                 this.pathToServerList = pathToServerList;
             } else {
                 this.pathToServerList = new File(System.getProperty("user.home"));
+            }
             this.showCrsWarning = showCrsWarning;
             columnNames =
                 new String[] {
                     Messages.getText("name"),
                     Messages.getText("url"),
                     Messages.getText("levels"),
                     Messages.getText("format"),
                 };
             init();
+        }
     	private void init() {
     		GridBagConstraints gridBagConstraints;
     		setLayout(new GridBagLayout());
-...
     		gridBagConstraints.gridy = 3;
     		add(getJPanelButtonsPanel(), gridBagConstraints);
     		if(this.showCrsWarning){
     		    gridBagConstraints.gridy = 4;
     		    add(getJPanelCrsWarningPanel(), gridBagConstraints);
+    		}
+    	}
     	private JPanel getJPanelButtonsPanel() {
-...
     		return buttonsPanel;
+    	}
     	   private JPanel getJPanelCrsWarningPanel() {
             if (crsWarningPanel == null) {
                 FlowLayout fl = new FlowLayout();
                 crsWarningPanel = new JPanel(fl);
                 // if(this.showCrsWarning){
                 I18nManager i18nManager = ToolsLocator.getI18nManager();
                 StringBuilder builder = new StringBuilder();
                 builder.append("<html><font color=\"red\">");
                 builder.append(i18nManager.getTranslation("_crs_warning"));
                 builder.append("</font></body></html>");
                 crsWarningLabel = new JLabel(Messages.getText(builder.toString()));
                 crsWarningPanel.add(crsWarningLabel, fl);
                 // }
+            }
     	        return crsWarningPanel;
+    	    }
     	private JPanel getJPanelSelectedServer() {
     		if(selectedServerPanel == null) {
     			selectedServerPanel = new JPanel(new BorderLayout());

     /**
      * Default implementation of the {@link DefaultOSMSwingManager}.
+     *
+     *
      * @author gvSIG Team
      * @version $Id$
      */
-...
         private I18nManager i18nmanager = null;
         public DefaultOSMSwingManager() {
             this.i18nmanager = ToolsLocator.getI18nManager();
             this.i18nmanager = ToolsLocator.getI18nManager();
+        }
         public String getTranslation(String key) {
             return this.i18nmanager.getTranslation(key);
+        }
     	/**
     	 * Obtiene la traducci?n de la cadena de texto
     	 * @param text Cadena a traducir
-...
         public AddOSMLayerPanel createAddOSMLayerPanel(File pathToServerList) {
         	return new AddOSMLayerPanelImpl(pathToServerList);
+        }
         public AddOSMLayerPanel createAddOSMLayerPanel(File pathToServerList, boolean showCrsWaring) {
             return new AddOSMLayerPanelImpl(pathToServerList, showCrsWaring);
+        }
+    }

      * This class is responsible of the management of the library's swing user
      * interface. It is the swing library's main entry point, and provides all the
      * services to manage library swing components.
+     *
+     *
      * @see RasterWindowManager
      * @see JValidationServicePanel
      * @author gvSIG team
-...
         /**
          * Returns the translation of a string.
+         *
+         *
          * @param key
          *            String to translate
          * @return a String with the translation of the string passed by parameter
-...
          * @return
          */
         public AddOSMLayerPanel createAddOSMLayerPanel(File pathToServerList);
         /**
          * Creates <b>AddOSMLayerPanel</b>
          * @param pathToServerList
          *        Path to the directory where the server list is stored
          * @param showCrsWarning
          * @return
          */
         public AddOSMLayerPanel createAddOSMLayerPanel(File pathToServerList, boolean showCrsWarning);
+    }

     	public AddOSMLayerWizard() {
     		super();
     		initialize();
+    	}
     	/**
-...
     		gridBagConstraints.weighty = 1.0;
     		gridBagConstraints.insets = new Insets(6, 6, 6, 6);
     		apiUI = OSMSwingLocator.getSwingManager().createAddOSMLayerPanel(new File(Launcher.getAppHomeDir()));
     		boolean showCrsWarning = false;
     		IProjection osmProjection = CRSFactory.getCRS("EPSG:3857");
             if(getMapCtrl()!=null && !(getMapCtrl().getProjection().equals(osmProjection))){
                 showCrsWarning = true;
+            }
     		apiUI = OSMSwingLocator.getSwingManager().createAddOSMLayerPanel(new File(Launcher.getAppHomeDir()),showCrsWarning);
     		//Copying osmservers.properties
     		if(!new File(apiUI.getPropertiesFilePath()).exists()) {
-...
     			FileUtils utils = RasterLocator.getManager().getFileUtils();
     			try {
     				utils.copyFile(f.getAbsolutePath(), Launcher.getAppHomeDir() + File.separator);
     				apiUI = OSMSwingLocator.getSwingManager().createAddOSMLayerPanel(new File(Launcher.getAppHomeDir()));
     				apiUI = OSMSwingLocator.getSwingManager().createAddOSMLayerPanel(new File(Launcher.getAppHomeDir()),showCrsWarning);
     			} catch (FileNotFoundException e) {
     				logger.info("File not found copying osmservers.properties", e);
     			} catch (IOException e) {
-...
     	@Override
     	public void initWizard() {
     	    initialize();
+    	}
     	public void mouseClicked(MouseEvent e) {

org.gvsig.raster.osm/trunk/org.gvsig.raster.osm/org.gvsig.raster.osm.app.osmclient/src/main/resources-plugin/text_en.properties
3	3	server_not_selected=There is not a server selected
4	4	error_loading_epsg=Error loading EPSG:3785 in database from OSM plug-in.\n Checks if JCRS plug-in is installed and running. \nThis projection is not available.
5	5	dont_remind_me_anymore=Don't remind me anymore
6		ok=OK
	6	ok=OK
	7
	8	_crs_warning=The projection of the view is not appropriate to load layers of this service.

     error_creating_the_view=Error creando una vista nueva. Pruebe creando una manualmente.
     error_creating_parameters=Error creando los par?metros
     error_creating_parameters=Error creando los par\u00e1metros
     server_not_selected=No hay un servidor seleccionado
     error_loading_epsg=Error cargando el EPSG:3785 desde el plugin de OSM.\n Comprueba que la extensi?n JCRS est? instalada y funcionando. \n Esta proyecci?n no estar? disponible aunque la \n carga de tiles deber?a funcionar correctamente.
     dont_remind_me_anymore=No me lo recuerdes m?s
     ok=OK
     error_loading_epsg=Error cargando el EPSG:3785 desde el plugin de OSM.\n Comprueba que la extensi\u00f3n JCRS est\u00e1 instalada y funcionando. \n Esta proyecci\u00f3n no estar\u00e1 disponible aunque la \n carga de tiles deber\u00eda funcionar correctamente.
     dont_remind_me_anymore=No me lo recuerdes m\u00e1s
     ok=OK
     _crs_warning=La proyecci\u00f3n de la vista no es la adecuada para cargar capas de este servicio.

gvSIG data provider for OpenStreetMap (raster)

Revision 309