Revision 12 trunk/org.gvsig.mssqlserver/org.gvsig.mssqlserver.provider/src/main/java/org/gvsig/mssqlserver/dal/MSSQLServerExplorerParameters.java

View differences:

MSSQLServerExplorerParameters.java
24 24
 */
25 25
package org.gvsig.mssqlserver.dal;
26 26

  
27
import org.apache.commons.lang3.StringUtils;
27 28
import org.gvsig.fmap.dal.exception.ValidateDataParametersException;
28 29
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters;
29 30

  
......
38 39
    }
39 40

  
40 41
    @Override
42
    public String getUrl() {
43
        String url = super.getUrl();
44
        if( StringUtils.isEmpty(url) ) {
45
            url = MSSQLServerSQLHelper.getConnectionURL(this);
46
            this.setUrl(url);
47
        }
48
        return url;
49
    }
50

  
51
    @Override
41 52
    public void validate() throws ValidateDataParametersException {
42 53
        if (getJDBCDriverClassName() == null) {
43 54
            setJDBCDriverClassName(MSSQLServerSQLHelper.MSSQLServerJDBCDriver);
......
48 59
        if( getDynValue("instanceName") == null ) {
49 60
            setDynValue("InstanceName", MSSQLServerSQLHelper.INSTANCE_NAME);
50 61
        }
51
        if (getUrl() == null) {
52
            setUrl(MSSQLServerSQLHelper.getConnectionURL(this));
53
        }
54 62
        super.validate();
55 63
    }
56 64
}

Also available in: Unified diff