Revision 41691 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.installer/org.gvsig.installer.lib/org.gvsig.installer.lib.impl/src/main/java/org/gvsig/installer/lib/impl/DefaultInstallerManager.java

View differences:

DefaultInstallerManager.java
29 29

  
30 30
import java.io.File;
31 31
import java.io.FileInputStream;
32
import java.io.FileNotFoundException;
33 32
import java.io.IOException;
34 33
import java.io.InputStream;
35 34
import java.net.URL;
36 35
import java.text.MessageFormat;
37 36
import java.util.ArrayList;
38 37
import java.util.Collection;
38
import java.util.HashMap;
39 39
import java.util.HashSet;
40 40
import java.util.Iterator;
41 41
import java.util.List;
42
import java.util.Map;
42 43
import java.util.Set;
43
import java.util.logging.Level;
44
import java.util.logging.Logger;
45 44
import org.apache.commons.lang3.StringUtils;
46 45

  
47 46
import org.gvsig.installer.lib.api.DependenciesCalculator;
......
167 166
    private URL BaseDownloadURL = null;
168 167
    private Version version = null;
169 168
    private List<LocalRepositoryLocation> localRepositoriesLocation = null;
170
    private File defaultRepositoryLocation = null;
169
    private Map<String,File> defaultRepositoryLocation = null;
171 170

  
172 171
    public DefaultInstallerManager() {
173 172
        super(new DefaultInstallerProviderManager());
173
        this.defaultRepositoryLocation = new HashMap<String,File>();
174 174
        localRepositoriesLocation = new LocalRepositoriesLocations();
175 175
    }
176 176

  
......
445 445
    }
446 446

  
447 447
    public File getDefaultLocalAddonRepository() {
448
        return this.defaultRepositoryLocation;
448
        File f = this.defaultRepositoryLocation.get("plugin");
449
        return f;
449 450
    }
450 451

  
451 452
    public void setDefaultLocalAddonRepository(File defaultAddonsRepository) {
452
        this.defaultRepositoryLocation = defaultAddonsRepository;
453
        this.localRepositoriesLocation.add(new LocalRepositoryLocation(defaultAddonsRepository));
453
        this.defaultRepositoryLocation.put("plugin", defaultAddonsRepository);
454
        this.localRepositoriesLocation.add(new LocalRepositoryLocation(defaultAddonsRepository, "plugin"));
454 455
    }
455 456

  
456 457
    public void addLocalAddonRepository(File path) {
457
        this.addLocalAddonRepository(path, null);
458
        this.addLocalAddonRepository(path, "plugin");
458 459
    }
459 460

  
461
    public File getDefaultLocalAddonRepository(String packageType) {
462
        File f = this.defaultRepositoryLocation.get(packageType);
463
        return f;
464
    }
465

  
466
    public void setDefaultLocalAddonRepository(File defaultAddonsRepository, String packageType) {
467
        this.defaultRepositoryLocation.put(packageType, defaultAddonsRepository);
468
        this.localRepositoriesLocation.add(new LocalRepositoryLocation(defaultAddonsRepository, packageType));
469
    }
470

  
460 471
    public void addLocalAddonRepository(File path, String type) {
461 472
        localRepositoriesLocation.add(new LocalRepositoryLocation(path, type));
462 473
    }

Also available in: Unified diff