/ - Diff - | gvSIG desktop 1 - gvSIG

Revision 37601

branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.lib/org.gvsig.installer.lib.impl/src/main/java/org/gvsig/installer/lib/impl/info/InstallerInfoFileWriter.java
149	149	properties.setProperty(InstallerInfoTags.DOWNLOAD_URL,
150	150	downloadURL.toString());
151	151	}
	152	URL ownerURL = installInfo.getOwnerURL();
	153	if (ownerURL != null) {
	154	properties.setProperty(InstallerInfoTags.OWNER_URL,
	155	ownerURL.toString());
	156	}
152	157	properties.setProperty(InstallerInfoTags.MODEL_VERSION, installInfo
153	158	.getModelVersion());
154	159	properties.store(os, "");
...	...
157	162	throw new InstallerInfoFileException(
158	163	"install_infofile_writing_error", e);
159	164	}
160
161	165	}
162	166	}

branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.lib/org.gvsig.installer.lib.impl/src/main/java/org/gvsig/installer/lib/impl/info/InstallerInfoTags.java
48	48	public static final String DOWNLOAD_URL = "download-url";
49	49	public static final String MODEL_VERSION = "model-version";
50	50	public static final String OWNER = "owner";
	51	public static final String OWNER_URL = "owner-url";
51	52	public static final String SOURCES_URL = "sources-url";
52	53	public static final String WEB_URL = "web-url";
53	54	public static final String DEPENDENCIES = "dependencies";

     		} else {
     			installerInfoResource.setWebURL(null);
+    		}
     		String ownerURLStr = properties.getProperty(InstallerInfoTags.OWNER_URL);
     		if (ownerURLStr != null && !ownerURLStr.equals("")) {
     			URL ownerUrl;
     			try {
     				ownerUrl = new URL(ownerURLStr);
     			} catch (MalformedURLException e) {
     				throw new InstallerInfoFileException(
     						"Error getting the value of the owner url property as URL: "
     								+ ownerURLStr, e);
+    			}
     			installerInfoResource.setOwnerURL(ownerUrl);
     		} else {
     			installerInfoResource.setOwnerURL(null);
+    		}
     		String categories = properties
     				.getProperty(InstallerInfoTags.CATEGORIES);

     	private String javaVM = JVM.J1_5;
     	private String owner = "";
     	private URL ownerURL = null;
     	private URL sources = null;
     	private String gvSIGVersion = "";
-...
     	public URL getDownloadURL() {
     		URL url = null;
     		try {
     			url = new URL(defaultDownloadURL);
     		} catch (MalformedURLException e) {
     			// TODO Auto-generated catch block
     			e.printStackTrace();
     		if (defaultDownloadURL != null) {
     			try {
     				url = new URL(defaultDownloadURL);
     			} catch (MalformedURLException e) {
     				// TODO Auto-generated catch block
     				e.printStackTrace();
+    			}
+    		}
     		return url;
+    	}
-...
     		this.owner = owner;
+    	}
     	public URL getOwnerURL() {
     		return ownerURL;
+    	}
     	public void setOwnerURL(URL sources) {
     		this.ownerURL = sources;
+    	}
     	public URL getSourcesURL() {
     		return sources;
+    	}
-...
     		append(buffer, InstallerInfoTags.TYPE, getType());
     		append(buffer, InstallerInfoTags.MODEL_VERSION, getModelVersion());
     		append(buffer, InstallerInfoTags.OWNER, getOwner());
     		append(buffer, InstallerInfoTags.OWNER_URL, getOwnerURL());
     		append(buffer, InstallerInfoTags.SOURCES_URL, getSourcesURL());
     		append(buffer, InstallerInfoTags.DEPENDENCIES, getDependencies());
     		append(buffer, InstallerInfoTags.WEB_URL, getWebURL());

     	 *            the package owner
     	 */
     	public void setOwner(String owner);
     	/**
     	 * Returns the owner's url {@link URL}.
+    	 *
     	 * @return the owner's url {@link URL}
     	 */
     	public URL getOwnerURL();
     	/**
     	 * Sets the package owner's url.
+    	 *
     	 * @param sources
     	 *            the package owner's url
     	 */
     	public void setOwnerURL(URL sources);
     	/**
     	 * Returns the package source files url {@link URL}.
+    	 *
     	 * @return the package source files url {@link URL}

     				.hasAnyPackageSelected();
+    	}
     	// shows the package info in the wizard
     	public void valueChanged(ListSelectionEvent e) {
     		int row = pluginsTable.getSelectedRow();
     		if (row != -1) {
-...
     			} else {
     				owner = "Owner: " + owner + "\n";
+    			}
     			String ownerUrlStr;
     			URL ownerURL = ((PackagesTableModel) pluginsTable.getModel())
     					.getOwnerUrlAt(row);
     			if (ownerURL == null) {
     				ownerUrlStr = "";
     			} else {
     				ownerUrlStr = "Owner URL: " + ownerURL.toString() + "\n";
+    			}
     			String sources;
     			URL sourcesURL = ((PackagesTableModel) pluginsTable.getModel())
-...
+    			}
     			String descriptionText = name + "\n" + description + "\n" + code
     					+ owner + sources + depends + categories;
     					+ owner + ownerUrlStr + sources + depends + categories;
     			descriptionTextArea.setText(descriptionText.trim());

     			@Override
     			public String getDescription() {
     				return "gvSIG packags and package and index sets (*."
     				return "gvSIG packages and package and index sets (*."
     						+ packageExt + ", *." + packageSetExt + ", *."
     						+ indexSetExt + ")";
+    			}

     	public URL getSourcesAt(int rowIndex) {
     		return getPackageInfoAt(rowIndex).getSourcesURL();
+    	}
     	public URL getOwnerUrlAt(int rowIndex) {
     		return getPackageInfoAt(rowIndex).getOwnerURL();
+    	}
     	public String getOwnerAt(int rowIndex) {
     		return getPackageInfoAt(rowIndex).getOwner();

     import javax.swing.JComboBox;
     import javax.swing.JLabel;
     import javax.swing.JOptionPane;
     import javax.swing.JPanel;
     import javax.swing.JScrollPane;
     import javax.swing.JTextArea;
     import javax.swing.JTextField;
-...
     	private JTextField ownerText;
     	private JLabel dependenciesLabel;
     	private JTextField dependenciesText;
     	private JLabel ownerURLLabel;
     	private JTextField ownerURLText;
     	// private JScrollPane scrollPane;
     	private JPanel newPanel;
     	public DefaultPackageInfoPanel() {
     		super();
     		swingInstallerManager = (DefaultSwingInstallerManager) SwingInstallerLocator
     				.getSwingInstallerManager();
     		initComponents();
     		// initComponents2();
     		initCombos();
+    	}
-...
     		sourcesText = new JTextField();
     		ownerLabel = new JLabel();
     		ownerText = new JTextField();
     		ownerURLLabel = new JLabel();
     		ownerURLText = new JTextField();
     		dependenciesLabel = new JLabel();
     		dependenciesText = new JTextField();
-...
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		add(ownerText, gridBagConstraints);
     		sourcesLabel.setText(swingInstallerManager.getText("sources_url"));
     		ownerURLLabel.setText(swingInstallerManager
     				.getText("package_URL_owner"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 12;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		add(ownerURLLabel, gridBagConstraints);
     		ownerURLText.setPreferredSize(new Dimension(100, 27));
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 12;
     		gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		add(ownerURLText, gridBagConstraints);
     		sourcesLabel.setText(swingInstallerManager.getText("sources_url"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 13;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		add(sourcesLabel, gridBagConstraints);
     		sourcesText.setPreferredSize(new Dimension(100, 27));
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 12;
     		gridBagConstraints.gridy = 13;
     		gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
-...
     				.setText(swingInstallerManager.getText("dependencies"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 13;
     		gridBagConstraints.gridy = 14;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		add(dependenciesLabel, gridBagConstraints);
-...
     		dependenciesText.setPreferredSize(new Dimension(100, 27));
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 13;
     		gridBagConstraints.gridy = 14;
     		gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		add(dependenciesText, gridBagConstraints);
+    	}
     	private void initComponents2() {
     		java.awt.GridBagConstraints gridBagConstraints;
     		// new
     		newPanel = new JPanel();
     		nameLabel = new JLabel();
     		nameText = new JTextField();
     		descriptionScrollPane = new JScrollPane();
     		descriptionArea = new JTextArea();
     		descriptionLabel = new JLabel();
     		versionLabel = new JLabel();
     		versionText = new JTextField();
     		buildLabel = new JLabel();
     		buildText = new JTextField();
     		statusLabel = new JLabel();
     		statusCombo = new JComboBox();
     		officialLabel = new javax.swing.JLabel();
     		officialCheckBox = new JCheckBox();
     		codeLabel = new JLabel();
     		codeText = new JTextField();
     		operatingSystemLabel = new JLabel();
     		operatingSystemCombo = new JComboBox();
     		architectureLabel = new JLabel();
     		architectureCombo = new JComboBox();
     		javaVMLabel = new JLabel();
     		javaVMCombo = new JComboBox();
     		applicationVersionLabel = new JLabel();
     		applicationVersionText = new JTextField();
     		sourcesLabel = new JLabel();
     		sourcesText = new JTextField();
     		ownerLabel = new JLabel();
     		ownerText = new JTextField();
     		ownerURLLabel = new JLabel();
     		ownerURLText = new JTextField();
     		dependenciesLabel = new JLabel();
     		dependenciesText = new JTextField();
     		newPanel.setLayout(new java.awt.GridBagLayout());
     		nameLabel.setText(swingInstallerManager.getText("name"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 1;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(nameLabel, gridBagConstraints);
     		nameText.setPreferredSize(new Dimension(100, 27));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 1;
     		gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(nameText, gridBagConstraints);
     		descriptionLabel.setText(swingInstallerManager.getText("description"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 2;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(descriptionLabel, gridBagConstraints);
     		descriptionArea.setColumns(20);
     		descriptionArea.setRows(5);
     		descriptionScrollPane.setViewportView(descriptionArea);
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 2;
     		gridBagConstraints.fill = GridBagConstraints.BOTH;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.weighty = 1.0;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(descriptionScrollPane, gridBagConstraints);
     		versionLabel.setText(swingInstallerManager.getText("version"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 3;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(versionLabel, gridBagConstraints);
     		versionText.setPreferredSize(new Dimension(100, 27));
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 3;
     		gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(versionText, gridBagConstraints);
     		buildLabel.setText(swingInstallerManager.getText("build"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 4;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(buildLabel, gridBagConstraints);
     		buildText.setPreferredSize(new java.awt.Dimension(100, 27));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 4;
     		gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(buildText, gridBagConstraints);
     		officialLabel.setText(swingInstallerManager.getText("is_official"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 6;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
     		newPanel.add(officialLabel, gridBagConstraints);
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 6;
     		gridBagConstraints.anchor = GridBagConstraints.WEST;
     		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
     		newPanel.add(officialCheckBox, gridBagConstraints);
     		statusLabel.setText(swingInstallerManager.getText("status"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 5;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(statusLabel, gridBagConstraints);
     		statusCombo.setPreferredSize(new java.awt.Dimension(100, 27));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 5;
     		gridBagConstraints.anchor = GridBagConstraints.WEST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(statusCombo, gridBagConstraints);
     		codeLabel.setText(swingInstallerManager.getText("code"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(codeLabel, gridBagConstraints);
     		codeText.setPreferredSize(new java.awt.Dimension(100, 27));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(codeText, gridBagConstraints);
     		operatingSystemLabel.setText(swingInstallerManager
     				.getText("operating_system"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 7;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(operatingSystemLabel, gridBagConstraints);
     		operatingSystemCombo.setPreferredSize(new java.awt.Dimension(100, 27));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 7;
     		gridBagConstraints.anchor = GridBagConstraints.WEST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(operatingSystemCombo, gridBagConstraints);
     		architectureLabel
     				.setText(swingInstallerManager.getText("architecture"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 8;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(architectureLabel, gridBagConstraints);
     		architectureCombo.setPreferredSize(new java.awt.Dimension(100, 27));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 8;
     		gridBagConstraints.anchor = GridBagConstraints.WEST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(architectureCombo, gridBagConstraints);
     		javaVMLabel.setText(swingInstallerManager.getText("java_version"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 9;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(javaVMLabel, gridBagConstraints);
     		javaVMCombo.setPreferredSize(new java.awt.Dimension(100, 27));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 9;
     		gridBagConstraints.anchor = GridBagConstraints.WEST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(javaVMCombo, gridBagConstraints);
     		applicationVersionLabel.setText(swingInstallerManager
     				.getText("gvSIG_desktop_version"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 10;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(applicationVersionLabel, gridBagConstraints);
     		applicationVersionText.setText(findCurrentGvSIGVersion());
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 10;
     		gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(applicationVersionText, gridBagConstraints);
     		ownerLabel.setText(swingInstallerManager.getText("package_owner"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 11;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(ownerLabel, gridBagConstraints);
     		ownerText.setPreferredSize(new Dimension(100, 27));
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 11;
     		gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(ownerText, gridBagConstraints);
     		sourcesLabel.setText(swingInstallerManager.getText("sources_url"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 12;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(sourcesLabel, gridBagConstraints);
     		sourcesText.setPreferredSize(new Dimension(100, 27));
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 12;
     		gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(sourcesText, gridBagConstraints);
     		dependenciesLabel
     				.setText(swingInstallerManager.getText("dependencies"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 13;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(dependenciesLabel, gridBagConstraints);
     		dependenciesText.setPreferredSize(new Dimension(100, 27));
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 13;
     		gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(dependenciesText, gridBagConstraints);
     		ownerURLLabel.setPreferredSize(new Dimension(100, 27));
     		ownerURLLabel.setText(swingInstallerManager
     				.getText("package_URL_owner"));
     		gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 14;
     		gridBagConstraints.anchor = GridBagConstraints.EAST;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(ownerURLLabel, gridBagConstraints);
     		ownerURLText.setPreferredSize(new Dimension(100, 27));
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 14;
     		gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.insets = new Insets(2, 2, 2, 2);
     		newPanel.add(ownerURLText, gridBagConstraints);
     		// scrollPane = new JScrollPane(newPanel);
     		add(newPanel);
+    	}
     	protected String findCurrentGvSIGVersion() {
     		return SwingInstallerLocator.getSwingInstallerManager()
     				.getApplicationVersion();
-...
     	/**
     	 * @return the build
     	 */
     	public Integer getBuild() {
     	private Integer getBuild() {
     		try {
     			return Integer.parseInt(buildText.getText());
     		} catch (Exception e) {
-...
     	 * @param build
     	 *            the build to set
     	 */
     	public void setBuildText(Integer build) {
     	private void setBuildText(Integer build) {
     		this.buildText.setText(build.toString());
+    	}
     	/**
     	 * @return the code
     	 */
     	public String getCode() {
     	private String getCode() {
     		return codeText.getText();
+    	}
-...
     	 * @param code
     	 *            the codeText to set
     	 */
     	public void setCode(String code) {
     	private void setCode(String code) {
     		this.codeText.setText(code);
+    	}
-...
     	/**
     	 * @return the offcicial
     	 */
     	public boolean isOfficial() {
     	private boolean isOfficial() {
     		return officialCheckBox.isSelected();
+    	}
-...
     	 * @param offcicial
     	 *            the offcicial to set
     	 */
     	public void setOfficial(boolean isOfficial) {
     	private void setOfficial(boolean isOfficial) {
     		this.officialCheckBox.setSelected(isOfficial);
+    	}
     	/**
     	 * @return the status
     	 */
     	public String getState() {
     	private String getState() {
     		return (String) statusCombo.getSelectedItem();
+    	}
-...
     	 * @param status
     	 *            the status to set
     	 */
     	public void setState(String state) {
     	private void setState(String state) {
     		this.statusCombo.setSelectedItem(state);
+    	}
     	/**
     	 * @return the version
     	 */
     	public String getVersion() {
     	private String getVersion() {
     		return versionText.getText();
+    	}
-...
     	 * @param version
     	 *            the version to set
     	 */
     	public void setVersion(String version) {
     	private void setVersion(String version) {
     		this.versionText.setText(version);
+    	}
     	/**
     	 * @return the descriptionArea
     	 */
     	public String getDescription() {
     	private String getDescription() {
     		return descriptionArea.getText();
+    	}
-...
     	 * @param descriptionArea
     	 *            the descriptionArea to set
     	 */
     	public void setDescription(String description) {
     	private void setDescription(String description) {
     		this.descriptionArea.setText(description);
+    	}
     	public String getOperatingSystem() {
     	private String getOperatingSystem() {
     		return (String) this.operatingSystemCombo.getSelectedItem();
+    	}
     	public void setOperatingSystem(String operatingSystem) {
     	private void setOperatingSystem(String operatingSystem) {
     		this.operatingSystemCombo.setSelectedItem(operatingSystem);
+    	}
     	public String getArchitecture() {
     	private String getArchitecture() {
     		return (String) this.architectureCombo.getSelectedItem();
+    	}
     	public void setArchitecture(String architecture) {
     	private void setArchitecture(String architecture) {
     		this.architectureCombo.setSelectedItem(architecture);
+    	}
     	public String getJavaVM() {
     	private String getJavaVM() {
     		return (String) this.javaVMCombo.getSelectedItem();
+    	}
     	public void setJavaVM(String javaVM) {
     	private void setJavaVM(String javaVM) {
     		this.javaVMCombo.setSelectedItem(javaVM);
+    	}
     	public String getGvSIGVersion() {
     	private String getGvSIGVersion() {
     		return this.applicationVersionText.getText();
+    	}
     	public void setGvSIGVersion(String gvSIGVersion) {
     	private void setGvSIGVersion(String gvSIGVersion) {
     		this.applicationVersionText.setText(gvSIGVersion);
+    	}
     	public void setOwner(String owner) {
     	private void setOwner(String owner) {
     		this.ownerText.setText(owner);
+    	}
     	public String getOwner() {
     	private String getOwner() {
     		return this.ownerText.getText();
+    	}
     	public void setSources(String sources) {
     	private void setSources(String sources) {
     		this.sourcesText.setText(sources);
+    	}
     	public URL getSources() throws MalformedURLException {
     	private URL getSources() throws MalformedURLException {
     		String str = this.sourcesText.getText();
     		str = str.trim();
     		if (str.equals("")) {
-...
     		return new URL(str);
+    	}
     	public void setDependencies(String dependencies) {
     	private void setOwnerURL(String sources) {
     		this.ownerURLText.setText(sources);
+    	}
     	private URL getOwnerURL() throws MalformedURLException {
     		String str = this.ownerURLText.getText();
     		str = str.trim();
     		if (str.equals("")) {
     			return null;
+    		}
     		return new URL(str);
+    	}
     	private void setDependencies(String dependencies) {
     		this.dependenciesText.setText(dependencies);
+    	}
     	public String getDependencies() {
     	private String getDependencies() {
     		return this.dependenciesText.getText();
+    	}
-...
     			JOptionPane
     					.showMessageDialog(
     							null,
     							"_the_package_source_files_url_is_malformed._Please_review_it.",
     							"_Malformed_URL", JOptionPane.OK_OPTION
     							swingInstallerManager
     									.getText("_the_package_source_files_url_is_malformed._Please_review_it"),
     							"_malformed_url", JOptionPane.OK_OPTION
     									+ JOptionPane.WARNING_MESSAGE);
     			return false;
+    		}
     		try {
     			getOwnerURL();
     		} catch (MalformedURLException e) {
     			JOptionPane.showMessageDialog(null, swingInstallerManager
     					.getText("_the_owners_url_is_malformed._Please_review_it"),
     					"_malformed_url", JOptionPane.OK_OPTION
     							+ JOptionPane.WARNING_MESSAGE);
     			return false;
+    		}
     		return true;
+    	}
-...
     		} catch (MalformedURLException e) {
     			throw new RuntimeException(e);
+    		}
     		try {
     			packageInfo.setOwnerURL(getOwnerURL());
     		} catch (MalformedURLException e) {
     			throw new RuntimeException(e);
+    		}
     		packageInfo.setOwner(getOwner());
     		packageInfo.setDependencies(getDependencies());
+    	}
-...
     		} else {
     			setOwner(packageInfo.getOwner());
+    		}
     		if (packageInfo.getOwnerURL() == null) {
     			setOwnerURL("");
     		} else {
     			setOwnerURL(packageInfo.getOwnerURL().toString());
+    		}
     		if (packageInfo.getDependencies() == null) {
     			setDependencies("");
     		} else {

branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.swing/org.gvsig.installer.swing.impl/src/main/resources/org/gvsig/symbology/app/symbolinstaller/text.properties
60	60	_cancel=Cancelar
61	61	_continue=Continuar
62	62	_error_creating_the_wizard=Error creando el asistente.
63		_malformed_url=Direcci?n URL incorrecta.
	63	_malformed_url=Direcci?n URL incorrecta.
	64	_the_package_source_files_url_is_malformed._Please_review_it=La URL de los archivos fuente del paquete es incorrecta. Por favor, rev?sala.
	65	_the_owners_url_is_malformed._Please_review_it=La URL del propietario es incorrecta. Por favor, rev?sala.

branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.swing/org.gvsig.installer.swing.impl/src/main/resources/org/gvsig/symbology/app/symbolinstaller/text_en.properties
60	60	_cancel=Cancel
61	61	_continue=Continue
62	62	_error_creating_the_wizard=Error creating the wizard
63		_malformed_url=Malformed URL
	63	_malformed_url=Malformed URL
	64	_the_package_source_files_url_is_malformed._Please_review_it=The package source files URL is malformed. Please review it.
	65	_the_owners_url_is_malformed._Please_review_it=The owner's URL is malformed. Please review it.

Also available in: Unified diff