Project

General

Profile

« Previous | Next » 

Revision e28d0ce1

Added by Cherian Mathew over 9 years ago

eu.etaxonomy.taxeditor.product, eu.etaxonomy.taxeditor.feature/feature.xml, eu.etaxonomy.taxeditor.feature.platform/feature.xml : commented out license text to prevent extra popup on update
plugin(_de,_en).properties : added license info to productBlurb used in the About popup
ApplicationWorkbenchWindowAdvisor, IPreferenceKeys, TaxonomicEditorGeneralPreferences : removed preference for allowing update checks on startup as this is already provided by rcp
ApplicationWorkbenchWindowAdvisor, ApplicationUtil, P2Util, UpdateHandler : changed setting of default repositories to make sure that they are set on startup

View differences:

eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/UpdateHandler.java
10 10
 *******************************************************************************/
11 11
package eu.etaxonomy.taxeditor.update;
12 12

  
13
import java.net.URISyntaxException;
14

  
15 13
import org.eclipse.equinox.internal.p2.ui.dialogs.UpdateSingleIUWizard;
16 14
import org.eclipse.equinox.p2.operations.RepositoryTracker;
17 15
import org.eclipse.equinox.p2.operations.UpdateOperation;
18 16
import org.eclipse.equinox.p2.ui.LoadMetadataRepositoryJob;
19 17
import org.eclipse.jface.wizard.WizardDialog;
20 18

  
21
import eu.etaxonomy.taxeditor.TaxonomicEditorPlugin;
22
import eu.etaxonomy.taxeditor.model.MessagingUtils;
23

  
24 19
/**
25 20
 * UpdateHandler invokes the check for updates UI
26 21
 *
......
32 27

  
33 28
	@Override
34 29
    protected void doExecute(LoadMetadataRepositoryJob job) {
35
//		if (hasNoRepos) {
36
//			return;
37
//		}
30
		if (hasNoRepos) {
31
			return;
32
		}
38 33
		UpdateOperation operation = getProvisioningUI().getUpdateOperation(null, null);
39
        try {
40
            P2Util.setUpdateRepositories(operation);
41
        } catch (URISyntaxException e) {
42
            MessagingUtils.errorDialog("Invalid update site URI",
43
                    operation,
44
                    "The update site URI has an invalid syntax",
45
                    TaxonomicEditorPlugin.PLUGIN_ID,
46
                    e,
47
                    false);
48
            return;
49
        }
34

  
50 35

  
51 36
		// check for updates
52 37
		operation.resolveModal(null);

Also available in: Unified diff