summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCurtis Windatt2013-07-31 14:32:29 (EDT)
committerCurtis Windatt2013-07-31 14:32:29 (EDT)
commit4bca27b30584b7401960ee3ece26714efe4bd796 (patch)
treea6d55103c3bf0dfb4893d0d5de74fde8173d062e
parente99d75b75f99059cb37a779556620eab5b40ebc9 (diff)
downloadeclipse.pde.ui-4bca27b30584b7401960ee3ece26714efe4bd796.zip
eclipse.pde.ui-4bca27b30584b7401960ee3ece26714efe4bd796.tar.gz
eclipse.pde.ui-4bca27b30584b7401960ee3ece26714efe4bd796.tar.bz2
Reduce number of warnings in PDE
Clean up javadoc, use non-deprecated options, suppress warnings for using team import provider code. Change-Id: I6c1ce3868f619a09b634558490621c22c506ceae
-rw-r--r--ui/org.eclipse.pde.core/.settings/.api_filters28
-rw-r--r--ui/org.eclipse.pde.core/.settings/org.eclipse.jdt.ui.prefs13
-rw-r--r--ui/org.eclipse.pde.core/.settings/org.eclipse.pde.prefs2
-rw-r--r--ui/org.eclipse.pde.core/plugin.properties3
-rw-r--r--ui/org.eclipse.pde.core/plugin.xml2
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/BinaryRepositoryProvider.java17
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/FeatureModelManager.java6
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java4
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEPreferencesManager.java6
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEState.java2
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PluginModelManager.java2
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/SourceLocationManager.java6
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPlatformHelper.java2
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/WorkspacePluginModelManager.java13
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/build/BuildObject.java14
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ExtensionsErrorReporter.java7
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/SourceEntryErrorReporter.java4
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/UpdateSiteErrorReporter.java9
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bundle/BundlePluginBase.java7
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/SiteBuildOperation.java8
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/feature/ExternalFeatureModel.java24
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ifeature/IFeature.java14
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ifeature/IFeatureURLElement.java5
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IJREInfo.java4
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/AbbreviatedFragmentModel.java5
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/AbbreviatedPluginHandler.java3
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/AbbreviatedPluginModel.java6
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/PluginReference.java9
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/project/BundleProjectService.java8
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/schema/IncludedSchemaDescriptor.java10
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/search/PluginSearchScope.java5
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/Site.java82
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteBundle.java12
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteCategoryDefinition.java30
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteFeature.java51
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteModelFactory.java21
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/IUBundleContainer.java11
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/LocalTargetHandle.java15
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java15
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPersistence35Helper.java7
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPlatformService.java9
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/IdUtil.java4
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/PDEHTMLHelper.java4
-rw-r--r--ui/org.eclipse.pde.core/text/org/eclipse/pde/internal/core/text/DocumentElementNode.java13
-rw-r--r--ui/org.eclipse.pde.core/text/org/eclipse/pde/internal/core/text/DocumentObject.java13
-rw-r--r--ui/org.eclipse.pde.launching/.settings/org.eclipse.jdt.ui.prefs13
-rw-r--r--ui/org.eclipse.pde.launching/.settings/org.eclipse.pde.prefs2
-rw-r--r--ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchValidationOperation.java3
-rw-r--r--ui/org.eclipse.pde.ui.tests/.settings/.api_filters12
-rw-r--r--ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.jdt.ui.prefs18
-rw-r--r--ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF2
-rw-r--r--ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/AbstractStructuredCommand.java15
-rw-r--r--ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/BooleanSelectionCommand.java15
-rw-r--r--ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroUtil.java50
-rw-r--r--ui/org.eclipse.pde.ui.tests/pom.xml2
-rw-r--r--ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/preferences/PDEPreferencesTestCase.java43
-rw-r--r--ui/org.eclipse.pde.ui/.settings/.api_filters42
-rw-r--r--ui/org.eclipse.pde.ui/.settings/org.eclipse.pde.prefs2
-rw-r--r--ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF1
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BaseBuildAction.java10
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/ImportActionGroup.java11
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java11
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationOperation.java3
64 files changed, 457 insertions, 340 deletions
diff --git a/ui/org.eclipse.pde.core/.settings/.api_filters b/ui/org.eclipse.pde.core/.settings/.api_filters
new file mode 100644
index 0000000..5d17ac3
--- /dev/null
+++ b/ui/org.eclipse.pde.core/.settings/.api_filters
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.pde.core" version="2">
+ <resource path="src/org/eclipse/pde/internal/core/project/BundleProjectService.java" type="org.eclipse.pde.internal.core.project.BundleProjectService">
+ <filter comment="Platform Team allows use of bundle importers for PDE import from source repository" id="640712815">
+ <message_arguments>
+ <message_argument value="Team"/>
+ <message_argument value="BundleProjectService"/>
+ <message_argument value="getBundleImporters()"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/pde/internal/core/target/ExportTargetJob.java" type="org.eclipse.pde.internal.core.target.ExportTargetJob">
+ <filter comment="Using IProvidedCapability is the only current available option to export a p2 target correctly" id="640712815">
+ <message_arguments>
+ <message_argument value="IProvidedCapability"/>
+ <message_argument value="ExportTargetJob"/>
+ <message_argument value="getName()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Using IProvidedCapability is the only current available option to export a p2 target correctly" id="640712815">
+ <message_arguments>
+ <message_argument value="IProvidedCapability"/>
+ <message_argument value="ExportTargetJob"/>
+ <message_argument value="getNamespace()"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/ui/org.eclipse.pde.core/.settings/org.eclipse.jdt.ui.prefs b/ui/org.eclipse.pde.core/.settings/org.eclipse.jdt.ui.prefs
index 4079175..87ab70a 100644
--- a/ui/org.eclipse.pde.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/ui/org.eclipse.pde.core/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,3 @@
-#Sun Dec 23 21:49:35 CST 2007
eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
formatter_profile=_core
@@ -14,6 +13,7 @@ sp_cleanup.add_missing_deprecated_annotations=true
sp_cleanup.add_missing_methods=false
sp_cleanup.add_missing_nls_tags=false
sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
sp_cleanup.add_serial_version_id=false
sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
@@ -26,10 +26,11 @@ sp_cleanup.format_source_code_changes_only=false
sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
@@ -37,12 +38,12 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
sp_cleanup.remove_unused_local_variables=false
sp_cleanup.remove_unused_private_fields=true
sp_cleanup.remove_unused_private_members=false
diff --git a/ui/org.eclipse.pde.core/.settings/org.eclipse.pde.prefs b/ui/org.eclipse.pde.core/.settings/org.eclipse.pde.prefs
index 88a12c6..796ada1 100644
--- a/ui/org.eclipse.pde.core/.settings/org.eclipse.pde.prefs
+++ b/ui/org.eclipse.pde.core/.settings/org.eclipse.pde.prefs
@@ -17,7 +17,7 @@ compilers.p.matching-pom-version=0
compilers.p.missing-packages=0
compilers.p.missing-version-export-package=2
compilers.p.missing-version-import-package=2
-compilers.p.missing-version-require-bundle=2
+compilers.p.missing-version-require-bundle=1
compilers.p.no-required-att=0
compilers.p.not-externalized-att=1
compilers.p.unknown-attribute=1
diff --git a/ui/org.eclipse.pde.core/plugin.properties b/ui/org.eclipse.pde.core/plugin.properties
index db6730f..0f2ebf7 100644
--- a/ui/org.eclipse.pde.core/plugin.properties
+++ b/ui/org.eclipse.pde.core/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2011 IBM Corporation and others.
+# Copyright (c) 2000, 2013 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -20,6 +20,7 @@ expoint.javadoc.name = Javadoc Locations
expoint.target.name = Target Profiles
expoint.targetlocation.name = Target Locations
expoint.bundleClasspathResolvers.name = Bundle Classpath Resolvers
+exPoint.pluginClasspathContributors.name = Plug-in Classpath Contributors
target.name.0 = Base RCP (with Source)
target.name.1 = Base RCP (Binary Only)
diff --git a/ui/org.eclipse.pde.core/plugin.xml b/ui/org.eclipse.pde.core/plugin.xml
index f038fde..cec83ba 100644
--- a/ui/org.eclipse.pde.core/plugin.xml
+++ b/ui/org.eclipse.pde.core/plugin.xml
@@ -17,7 +17,7 @@
<extension-point id="targets" name="%expoint.target.name" schema="schema/targets.exsd"/>
<extension-point id="targetLocations" name="%expoint.targetlocation.name" schema="schema/targetLocations.exsd"/>
<extension-point id="bundleClasspathResolvers" name="%expoint.bundleClasspathResolvers.name" schema="schema/bundleClasspathResolvers.exsd"/>
- <extension-point id="pluginClasspathContributors" name="pluginClasspathContributors" schema="schema/pluginClasspathContributors.exsd"/>
+ <extension-point id="pluginClasspathContributors" name="%exPoint.pluginClasspathContributors.name" schema="schema/pluginClasspathContributors.exsd"/>
<extension
point="org.eclipse.jdt.core.classpathVariableInitializer">
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/BinaryRepositoryProvider.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/BinaryRepositoryProvider.java
index 51b125e..97296f4 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/BinaryRepositoryProvider.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/BinaryRepositoryProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -84,9 +84,10 @@ public class BinaryRepositoryProvider extends RepositoryProvider {
}
class BinaryFileModificationValidator extends FileModificationValidator {
- /**
- * @see org.eclipse.core.resources.IFileModificationValidator#validateEdit(org.eclipse.core.resources.IFile, java.lang.Object)
+ /* (non-Javadoc)
+ * @see org.eclipse.core.resources.team.FileModificationValidator#validateEdit(org.eclipse.core.resources.IFile[], org.eclipse.core.resources.team.FileModificationValidationContext)
*/
+ @Override
public IStatus validateEdit(IFile[] files, FileModificationValidationContext context) {
for (int i = 0; i < files.length; i++) {
if (isBinaryResource(files[i], false)) {
@@ -96,9 +97,10 @@ public class BinaryRepositoryProvider extends RepositoryProvider {
return createOKStatus();
}
- /**
- * @see org.eclipse.core.resources.IFileModificationValidator#validateSave(org.eclipse.core.resources.IFile)
+ /* (non-Javadoc)
+ * @see org.eclipse.core.resources.team.FileModificationValidator#validateSave(org.eclipse.core.resources.IFile)
*/
+ @Override
public IStatus validateSave(IFile file) {
if (isBinaryResource(file, false)) {
return createProblemStatus();
@@ -115,6 +117,7 @@ public class BinaryRepositoryProvider extends RepositoryProvider {
/**
* @see org.eclipse.team.core.RepositoryProvider#configureProject()
*/
+ @Override
public void configureProject() throws CoreException {
IProject project = getProject();
project.setPersistentProperty(PDECore.EXTERNAL_PROJECT_PROPERTY, EXTERNAL_PROJECT_VALUE);
@@ -131,6 +134,7 @@ public class BinaryRepositoryProvider extends RepositoryProvider {
/**
* @see org.eclipse.team.core.RepositoryProvider#getFileModificationValidator2()
*/
+ @Override
public FileModificationValidator getFileModificationValidator2() {
return fileModificationValidator;
}
@@ -138,6 +142,7 @@ public class BinaryRepositoryProvider extends RepositoryProvider {
/**
* @see org.eclipse.team.core.RepositoryProvider#getID()
*/
+ @Override
public String getID() {
return PDECore.BINARY_REPOSITORY_PROVIDER;
}
@@ -145,6 +150,7 @@ public class BinaryRepositoryProvider extends RepositoryProvider {
/**
* @see org.eclipse.team.core.RepositoryProvider#getMoveDeleteHook()
*/
+ @Override
public IMoveDeleteHook getMoveDeleteHook() {
return moveDeleteHook;
}
@@ -180,6 +186,7 @@ public class BinaryRepositoryProvider extends RepositoryProvider {
}
// we need to remove this but our tests will fail if we do, see bug 252003
+ @Override
public boolean canHandleLinkedResources() {
return true;
}
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/FeatureModelManager.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/FeatureModelManager.java
index 54b0eaa..2323d83 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/FeatureModelManager.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/FeatureModelManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,11 +10,10 @@
*******************************************************************************/
package org.eclipse.pde.internal.core;
-import org.eclipse.pde.internal.core.FeatureTable.Idver;
-
import java.util.*;
import org.eclipse.core.resources.IProject;
import org.eclipse.pde.core.*;
+import org.eclipse.pde.internal.core.FeatureTable.Idver;
import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
import org.eclipse.pde.internal.core.util.VersionUtil;
import org.osgi.framework.Version;
@@ -187,7 +186,6 @@ public class FeatureModelManager {
* Finds active models with a given id
*
* @param id
- * @param version
* @return IFeature model[]
*/
public IFeatureModel[] findFeatureModels(String id) {
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java
index f4adaaa..92837e7 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 IBM Corporation and others.
+ * Copyright (c) 2007, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -172,7 +172,7 @@ public class P2Utils {
* Returns a list of {@link BundleInfo} for each bundle entry or <code>null</code> if there
* is a problem reading the file.
*
- * @param file the URL of the file to read
+ * @param fileURL the URL of the file to read
* @param home the path describing the base location of the platform install
* @return list containing URL locations or <code>null</code>
* @throws IOException
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEPreferencesManager.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEPreferencesManager.java
index 4200485..4998214 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEPreferencesManager.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEPreferencesManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
+ * Copyright (c) 2009, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -41,7 +41,7 @@ public final class PDEPreferencesManager {
*
* @param listener the preference change listener to register
* @see #removePreferenceChangeListener(IEclipsePreferences.IPreferenceChangeListener)
- * @see IEclipsePreferences.IPreferenceChangeListener
+ * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener
*/
public void addPreferenceChangeListener(IPreferenceChangeListener listener) {
fInstanceScopePrefs.addPreferenceChangeListener(listener);
@@ -185,7 +185,7 @@ public final class PDEPreferencesManager {
*
* @param listener the preference change listener to remove
* @see #addPreferenceChangeListener(IEclipsePreferences.IPreferenceChangeListener)
- * @see IEclipsePreferences.IPreferenceChangeListener
+ * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener
*/
public void removePreferenceChangeListener(IPreferenceChangeListener listener) {
fInstanceScopePrefs.removePreferenceChangeListener(listener);
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEState.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEState.java
index 2e6fc90..c1118e0 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEState.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEState.java
@@ -213,6 +213,8 @@ public class PDEState extends MinimalState {
fCombined = localState != null && fAuxiliaryState.readPluginInfoCache(dir);
if (fCombined) {
long targetCount = fId;
+ // localState can't be null based on fCombined
+ @SuppressWarnings("null")
BundleDescription[] bundles = localState.getBundles();
for (int i = 0; i < bundles.length; i++) {
BundleDescription desc = bundles[i];
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PluginModelManager.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PluginModelManager.java
index fc751af..50d5ced 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PluginModelManager.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PluginModelManager.java
@@ -826,7 +826,7 @@ public class PluginModelManager implements IModelProviderListener {
// treat it as a regular model removal
handleRemove(oldID, model, delta);
model.setBundleDescription(null);
- } else if (oldID.equals(newID)) {
+ } else if (oldID != null && oldID.equals(newID)) {
// if the workspace bundle's MANIFEST.MF was touched or
// if the a target plug-in has now become enabled/checked, update the model
// in the state
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/SourceLocationManager.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/SourceLocationManager.java
index c238af3..ab0ac48 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/SourceLocationManager.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/SourceLocationManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -123,7 +123,7 @@ public class SourceLocationManager implements ICoreConstants {
/**
* Returns whether the given path describes a source location with a source bundle manifest entry.
- * @param location the path to test
+ * @param plugin the plug-in to test
* @return whether the given path is a bundle manifest location
*/
public boolean hasBundleManifestLocation(IPluginBase plugin) {
@@ -228,7 +228,7 @@ public class SourceLocationManager implements ICoreConstants {
* the given source file path. The result will typically be of the form
* PluginID_PluginVersion/src.zip.
* @param pluginBase the plugin that source is being looked up for
- * @param sourcePath the path to append that specifies the source file location
+ * @param sourceFilePath the path to append that specifies the source file location
* @return relative path describing where to find the source file
*/
private IPath getRelativePath(IPluginBase pluginBase, IPath sourceFilePath) {
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPlatformHelper.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPlatformHelper.java
index 0657fe1..458c17d 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPlatformHelper.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPlatformHelper.java
@@ -101,6 +101,8 @@ public class TargetPlatformHelper {
* @param osgiBundles list of bundles to strip path information from (commma separated)
* @return list of bundles with path information stripped
*/
+ @SuppressWarnings("null")
+ // String.subString() does not return null
public static String stripPathInformation(String osgiBundles) {
StringBuffer result = new StringBuffer();
StringTokenizer tokenizer = new StringTokenizer(osgiBundles, ","); //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/WorkspacePluginModelManager.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/WorkspacePluginModelManager.java
index bd5d774..bdec2c7 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/WorkspacePluginModelManager.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/WorkspacePluginModelManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
+ * Copyright (c) 2006, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -41,6 +41,7 @@ public class WorkspacePluginModelManager extends WorkspaceModelManager {
* The workspace plug-in model manager is only interested
* in changes to plug-in projects.
*/
+ @Override
protected boolean isInterestingProject(IProject project) {
return isPluginProject(project);
}
@@ -56,6 +57,7 @@ public class WorkspacePluginModelManager extends WorkspaceModelManager {
* file.
* </p>
*/
+ @Override
protected void createModel(IProject project, boolean notify) {
IPluginModelBase model = null;
IFile manifest = PDEProject.getManifest(project);
@@ -104,6 +106,7 @@ public class WorkspacePluginModelManager extends WorkspaceModelManager {
/**
* Reacts to changes in files of interest to PDE
*/
+ @Override
protected void handleFileDelta(IResourceDelta delta) {
IFile file = (IFile) delta.getResource();
IProject project = file.getProject();
@@ -136,7 +139,7 @@ public class WorkspacePluginModelManager extends WorkspaceModelManager {
}
/**
- * @param file
+ * @param schemaFile
* @param delta
*/
private void handleEclipseSchemaDelta(IFile schemaFile, IResourceDelta delta) {
@@ -310,6 +313,7 @@ public class WorkspacePluginModelManager extends WorkspaceModelManager {
* Removes the model associated with the given project from the table,
* if the given project is a plug-in project
*/
+ @Override
protected Object removeModel(IProject project) {
Object model = super.removeModel(project);
if (model != null && PDEProject.getOptionsFile(project).exists())
@@ -353,6 +357,7 @@ public class WorkspacePluginModelManager extends WorkspaceModelManager {
* Adds listeners to the workspace and to the java model
* to be notified of PRE_CLOSE events and POST_CHANGE events.
*/
+ @Override
protected void addListeners() {
IWorkspace workspace = PDECore.getWorkspace();
workspace.addResourceChangeListener(this, IResourceChangeEvent.PRE_CLOSE);
@@ -365,6 +370,7 @@ public class WorkspacePluginModelManager extends WorkspaceModelManager {
* Removes listeners that the model manager attached on others,
* as well as listeners attached on the model manager
*/
+ @Override
protected void removeListeners() {
PDECore.getWorkspace().removeResourceChangeListener(this);
JavaCore.removePreProcessingResourceChangedListener(this);
@@ -382,6 +388,7 @@ public class WorkspacePluginModelManager extends WorkspaceModelManager {
* <code>false</code> otherwise.
*
*/
+ @Override
protected boolean isInterestingFolder(IFolder folder) {
IContainer root = PDEProject.getBundleRoot(folder.getProject());
if (folder.getProjectRelativePath().isPrefixOf(root.getProjectRelativePath())) {
@@ -457,6 +464,7 @@ public class WorkspacePluginModelManager extends WorkspaceModelManager {
}
}
+ @Override
protected void processModelChanges() {
// process model changes first so model manager is accurate when we process extension events - bug 209155
super.processModelChanges();
@@ -464,6 +472,7 @@ public class WorkspacePluginModelManager extends WorkspaceModelManager {
fChangedExtensions = null;
}
+ @Override
protected void createAndFireEvent(String eventId, int type, Collection<IModel> added, Collection<IModel> removed, Collection<IModel> changed) {
if (eventId.equals("org.eclipse.pde.internal.core.IExtensionDeltaEvent")) { //$NON-NLS-1$
IExtensionDeltaEvent event = new ExtensionDeltaEvent(type, added.toArray(new IPluginModelBase[added.size()]), removed.toArray(new IPluginModelBase[removed.size()]), changed.toArray(new IPluginModelBase[changed.size()]));
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/build/BuildObject.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/build/BuildObject.java
index 821d0f8..35f5bca 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/build/BuildObject.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/build/BuildObject.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,9 +10,7 @@
*******************************************************************************/
package org.eclipse.pde.internal.core.build;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.*;
import org.eclipse.pde.core.build.IBuildModel;
import org.eclipse.pde.internal.core.PDECore;
import org.eclipse.pde.internal.core.PDECoreMessages;
@@ -49,6 +47,14 @@ public class BuildObject implements IBuildObject {
throw new CoreException(status);
}
+ /**
+ * If the property defined by name is valid, changes its value to newValue
+ *
+ * @param name name of the property to modify
+ * @param oldValue the previous value
+ * @param newValue the new value
+ * @throws CoreException if the build model is read only
+ */
public void restoreProperty(String name, Object oldValue, Object newValue) throws CoreException {
}
}
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ExtensionsErrorReporter.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ExtensionsErrorReporter.java
index 7135753..ef03f1f 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ExtensionsErrorReporter.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ExtensionsErrorReporter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
+ * Copyright (c) 2005, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -113,8 +113,7 @@ public class ExtensionsErrorReporter extends ManifestErrorReporter {
}
/**
- * @param parentElement
- * @param childElement
+ * @param result
* @param severity
*/
private void reportMaxOccurenceViolation(ElementOccurrenceResult result, int severity) {
@@ -126,7 +125,7 @@ public class ExtensionsErrorReporter extends ManifestErrorReporter {
/**
* @param parentElement
- * @param childElement
+ * @param result
* @param severity
*/
private void reportMinOccurenceViolation(Element parentElement, ElementOccurrenceResult result, int severity) {
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/SourceEntryErrorReporter.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/SourceEntryErrorReporter.java
index 7f0dfb4..3bacab6 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/SourceEntryErrorReporter.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/SourceEntryErrorReporter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2012 IBM Corporation and others.
+ * Copyright (c) 2009, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -389,7 +389,7 @@ public class SourceEntryErrorReporter extends BuildErrorReporter {
} else if (entry instanceof IPath) {
path = (IPath) entry;
}
- if (path.matchingFirstSegments(fProject.getFullPath()) > 0) {
+ if (path != null && path.matchingFirstSegments(fProject.getFullPath()) > 0) {
path = path.removeFirstSegments(1);
}
if (path != null) {
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/UpdateSiteErrorReporter.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/UpdateSiteErrorReporter.java
index 4132dee..c67f79c 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/UpdateSiteErrorReporter.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/UpdateSiteErrorReporter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,10 +12,7 @@ package org.eclipse.pde.internal.core.builders;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.NodeList;
+import org.w3c.dom.*;
public class UpdateSiteErrorReporter extends ManifestErrorReporter {
@@ -152,7 +149,7 @@ public class UpdateSiteErrorReporter extends ManifestErrorReporter {
}
/**
- * @param root
+ * @param parent
*/
private void validateDescription(Element parent) {
NodeList list = getChildrenByName(parent, "description"); //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bundle/BundlePluginBase.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bundle/BundlePluginBase.java
index c337e21..3991deb 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bundle/BundlePluginBase.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bundle/BundlePluginBase.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2012 IBM Corporation and others.
+ * Copyright (c) 2003, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -145,7 +145,10 @@ public class BundlePluginBase extends PlatformObject implements IBundlePluginBas
* @param header header to update
*/
private void removeLibrary(IPluginLibrary library, IManifestHeader header) {
- String value = header == null ? null : header.getValue();
+ if (header == null) {
+ return;
+ }
+ String value = header.getValue();
String name = library.getName();
int index = value.indexOf(name);
if (index >= 0) {
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/SiteBuildOperation.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/SiteBuildOperation.java
index e64d27f..9555465 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/SiteBuildOperation.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/SiteBuildOperation.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
+ * Copyright (c) 2006, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -60,6 +60,7 @@ public class SiteBuildOperation extends FeatureBasedExportOperation {
return info;
}
+ @Override
protected IStatus run(IProgressMonitor monitor) {
fBuildTime = System.currentTimeMillis();
IStatus status = super.run(monitor);
@@ -123,8 +124,6 @@ public class SiteBuildOperation extends FeatureBasedExportOperation {
* Finds the highest version from feature jars. ID and version components
* are constant. Qualifier varies
*
- * @param builtJars
- * candidate jars in format id_version.jar
* @param id
* @param major
* @param minor
@@ -174,6 +173,7 @@ public class SiteBuildOperation extends FeatureBasedExportOperation {
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.exports.FeatureBasedExportOperation#createPostProcessingFiles()
*/
+ @Override
protected void createPostProcessingFiles() {
createPostProcessingFile(new File(fFeatureLocation, FEATURE_POST_PROCESSING));
createPostProcessingFile(new File(fFeatureLocation, PLUGIN_POST_PROCESSING));
@@ -182,6 +182,7 @@ public class SiteBuildOperation extends FeatureBasedExportOperation {
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.exports.FeatureExportOperation#publishingP2Metadata()
*/
+ @Override
protected boolean publishingP2Metadata() {
return true;
}
@@ -189,6 +190,7 @@ public class SiteBuildOperation extends FeatureBasedExportOperation {
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.exports.FeatureExportOperation#setP2MetaDataProperties(java.util.Map)
*/
+ @Override
protected void setP2MetaDataProperties(Map<String, String> map) {
if (fInfo.toDirectory) {
map.put(IXMLConstants.TARGET_P2_METADATA, IBuildPropertiesConstants.TRUE);
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/feature/ExternalFeatureModel.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/feature/ExternalFeatureModel.java
index 36172fc..963e085 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/feature/ExternalFeatureModel.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/feature/ExternalFeatureModel.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,6 @@ package org.eclipse.pde.internal.core.feature;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
-
import org.eclipse.core.runtime.CoreException;
import org.eclipse.pde.internal.core.NLResourceHelper;
@@ -21,25 +20,28 @@ public class ExternalFeatureModel extends AbstractFeatureModel {
private static final long serialVersionUID = 1L;
private String location;
- /**
- * @see AbstractModel#updateTimeStamp()
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.AbstractModel#updateTimeStamp()
*/
protected void updateTimeStamp() {
}
- /**
- * @see IModel#isInSync()
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.core.IModel#isInSync()
*/
public boolean isInSync() {
return true;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.feature.AbstractFeatureModel#isEditable()
+ */
public boolean isEditable() {
return false;
}
- /**
- * @see IModel#load()
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.core.IModel#load()
*/
public void load() throws CoreException {
}
@@ -48,10 +50,16 @@ public class ExternalFeatureModel extends AbstractFeatureModel {
this.location = location;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.feature.AbstractFeatureModel#getInstallLocation()
+ */
public String getInstallLocation() {
return location;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.AbstractNLModel#createNLResourceHelper()
+ */
protected NLResourceHelper createNLResourceHelper() {
if (location != null) {
URL url = getNLLookupLocation();
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ifeature/IFeature.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ifeature/IFeature.java
index c691a7b..6d2b603 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ifeature/IFeature.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ifeature/IFeature.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -68,7 +68,7 @@ public interface IFeature extends IFeatureObject, IVersionable, IEnvironment {
* This method may throw a CoreException if
* the model is not editable.
*
- * @param reference a plug-in reference to add
+ * @param plugins a plug-in reference to add
*/
public void addPlugins(IFeaturePlugin[] plugins) throws CoreException;
@@ -104,7 +104,7 @@ public interface IFeature extends IFeatureObject, IVersionable, IEnvironment {
* This method may throw a CoreException if
* the model is not editable.
*
- * @param reference a required plug-in reference to add
+ * @param imports a required plug-in reference to add
*/
public void addImports(IFeatureImport[] imports) throws CoreException;
@@ -182,7 +182,7 @@ public interface IFeature extends IFeatureObject, IVersionable, IEnvironment {
* method may throw a CoreException if the model
* is not editable.
*
- * @param plugin a plug-in reference to remove
+ * @param plugins a plug-in reference to remove
*/
public void removePlugins(IFeaturePlugin[] plugins) throws CoreException;
@@ -200,7 +200,7 @@ public interface IFeature extends IFeatureObject, IVersionable, IEnvironment {
* This method may throw a CoreException if
* the model is not editable.
*
- * @param iimport a required plug-in reference to add
+ * @param imports a required plug-in reference to add
*/
public void removeImports(IFeatureImport[] imports) throws CoreException;
@@ -208,7 +208,7 @@ public interface IFeature extends IFeatureObject, IVersionable, IEnvironment {
* Sets the provider name of this feature. This method
* may throw a CoreException if the model is not editable.
*
- * @param the new provider name
+ * @param providerName the new provider name
*/
public void setProviderName(String providerName) throws CoreException;
@@ -216,7 +216,7 @@ public interface IFeature extends IFeatureObject, IVersionable, IEnvironment {
* Sets the image name of this feature. This method
* may throw a CoreException if the model is not editable.
*
- * @param the new image name
+ * @param imageName the new image name
*/
public void setImageName(String imageName) throws CoreException;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ifeature/IFeatureURLElement.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ifeature/IFeatureURLElement.java
index 18c11b1..22608f6 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ifeature/IFeatureURLElement.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ifeature/IFeatureURLElement.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
package org.eclipse.pde.internal.core.ifeature;
import java.net.URL;
-
import org.eclipse.core.runtime.CoreException;
/**
@@ -78,7 +77,7 @@ public interface IFeatureURLElement extends IFeatureObject {
/**
* Sets the type of the site with the specified URL.
- * @param UPDATE_SITE or WEB_SITE
+ * @param siteType UPDATE_SITE or WEB_SITE
*/
public void setSiteType(int siteType) throws CoreException;
}
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IJREInfo.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IJREInfo.java
index 0f302b5..0011a61 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IJREInfo.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IJREInfo.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * Copyright (c) 2007, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -40,7 +40,7 @@ public interface IJREInfo extends IProductObject {
* Sets the JRE container path to associate with the given target OS. The
* JRE container path may be set to <code>null</code> to remove the association.
* @param os the string describing the target os, must be one of the Platform.OS constants
- * @param JREContainerPath path representing the JRE container path, can be <code>null</code>
+ * @param jreContainerPath path representing the JRE container path, can be <code>null</code>
*/
public void setJREContainerPath(String os, IPath jreContainerPath);
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/AbbreviatedFragmentModel.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/AbbreviatedFragmentModel.java
index 506fcc9..c453f90 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/AbbreviatedFragmentModel.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/AbbreviatedFragmentModel.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
+ * Copyright (c) 2006, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,7 +12,6 @@
package org.eclipse.pde.internal.core.plugin;
import java.io.InputStream;
-
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
@@ -31,7 +30,7 @@ public class AbbreviatedFragmentModel extends WorkspaceFragmentModel {
/**
* @param file
- * @param abbreviated
+ * @param extensionPointIDs
*/
public AbbreviatedFragmentModel(IFile file, String[] extensionPointIDs) {
super(file, true);
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/AbbreviatedPluginHandler.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/AbbreviatedPluginHandler.java
index 1701c70..74c0496 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/AbbreviatedPluginHandler.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/AbbreviatedPluginHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
+ * Copyright (c) 2006, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,7 +23,6 @@ public class AbbreviatedPluginHandler extends PluginHandler {
private String[] fExtensionPointIDs;
/**
- * @param abbreviated
* @param extensionPointIDs
*/
public AbbreviatedPluginHandler(String[] extensionPointIDs) {
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/AbbreviatedPluginModel.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/AbbreviatedPluginModel.java
index c118888..224ab12 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/AbbreviatedPluginModel.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/AbbreviatedPluginModel.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
+ * Copyright (c) 2006, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,7 +12,6 @@
package org.eclipse.pde.internal.core.plugin;
import java.io.InputStream;
-
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
@@ -31,7 +30,7 @@ public class AbbreviatedPluginModel extends WorkspacePluginModel {
/**
* @param file
- * @param abbreviated
+ * @param extensionPointIDs
*/
public AbbreviatedPluginModel(IFile file, String[] extensionPointIDs) {
super(file, true);
@@ -52,6 +51,7 @@ public class AbbreviatedPluginModel extends WorkspacePluginModel {
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.plugin.AbstractPluginModelBase#load(java.io.InputStream, boolean)
*/
+ @Override
public void load(InputStream stream, boolean outOfSync) throws CoreException {
load(stream, outOfSync, new AbbreviatedPluginHandler(fExtensionPointIDs));
}
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/PluginReference.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/PluginReference.java
index 1369677..1e99edc 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/PluginReference.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/plugin/PluginReference.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,10 +11,7 @@
package org.eclipse.pde.internal.core.plugin;
import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.pde.core.plugin.IPlugin;
-import org.eclipse.pde.core.plugin.IPluginModel;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.PluginRegistry;
+import org.eclipse.pde.core.plugin.*;
public class PluginReference extends PlatformObject {
private String fId;
@@ -57,7 +54,7 @@ public class PluginReference extends PlatformObject {
}
/**
- * @param plugin
+ * @param model
*/
public void reconnect(IPluginModelBase model) {
// Transient Field: Plugin
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/project/BundleProjectService.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/project/BundleProjectService.java
index 68b7d7c..1779eea 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/project/BundleProjectService.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/project/BundleProjectService.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2012 IBM Corporation and others.
+ * Copyright (c) 2011, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -41,12 +41,12 @@ import org.osgi.framework.Version;
public final class BundleProjectService implements IBundleProjectService {
/**
- * Property key used in {@link BundleImportDescription}s.
+ * Property key used in {@link ScmUrlImportDescription}s.
*/
public static final String BUNDLE_IMPORTER = "BUNDLE_IMPORTER"; //$NON-NLS-1$
/**
- * Property key used in {@link BundleImportDescription}s.
+ * Property key used in {@link ScmUrlImportDescription}s.
*/
public static final String PLUGIN = "PLUGIN"; //$NON-NLS-1$
@@ -182,7 +182,7 @@ public final class BundleProjectService implements IBundleProjectService {
/**
* Creates and returns a map of bundle import descriptions for the given bundles.
- * The map is of {@link IBundleImporter} -> arrays of {@link BundleImportDescription}.
+ * The map is of {@link IBundleImporter} -> arrays of {@link ScmUrlImportDescription}.
* Adds 'BUNDLE_IMPORTER' property to each description that maps to the importer that
* created each description.
* Adds 'PLUGIN' property that maps to the original plug-in model.
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/schema/IncludedSchemaDescriptor.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/schema/IncludedSchemaDescriptor.java
index f8c113a..e607a29 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/schema/IncludedSchemaDescriptor.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/schema/IncludedSchemaDescriptor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,6 @@ package org.eclipse.pde.internal.core.schema;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
-
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.pde.core.plugin.IPluginModelBase;
@@ -75,14 +74,11 @@ public class IncludedSchemaDescriptor implements ISchemaDescriptor {
return url;
}
- /**
- * @see org.eclipse.pde.internal.core.schema.AbstractSchemaDescriptor#isEnabled()
- */
public boolean isEnabled() {
return true;
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.ischema.ISchemaDescriptor#getPointId()
*/
public String getPointId() {
@@ -93,7 +89,7 @@ public class IncludedSchemaDescriptor implements ISchemaDescriptor {
return null;
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.ischema.ISchemaDescriptor#getSchemaURL()
*/
public URL getSchemaURL() {
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/search/PluginSearchScope.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/search/PluginSearchScope.java
index 98e68f4..cb07f1f 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/search/PluginSearchScope.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/search/PluginSearchScope.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,7 +12,6 @@ package org.eclipse.pde.internal.core.search;
import java.util.ArrayList;
import java.util.HashSet;
-
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.PluginRegistry;
@@ -36,7 +35,7 @@ public class PluginSearchScope {
* SCOPE_WORKING_SETS
* @param externalScope one of EXTERNAL_SCOPE_NONE, EXTERNAL_SCOPE_ENABLED,
* EXTERNAL_SCOPE_ALL
- * @param workingSets goes with SCOPE_WORKING_SETS, otherwise null
+ * @param selectedResources goes with SCOPE_WORKING_SETS, otherwise null
*/
public PluginSearchScope(int workspaceScope, int externalScope, HashSet<?> selectedResources) {
this.workspaceScope = workspaceScope;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/Site.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/Site.java
index 67b4203..7a5b6e3 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/Site.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/Site.java
@@ -35,7 +35,7 @@ public class Site extends SiteObject implements ISite {
private String associateSitesUrl;
private ISiteDescription description;
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISite#setType(java.lang.String)
*/
public void setType(String type) throws CoreException {
@@ -45,15 +45,15 @@ public class Site extends SiteObject implements ISite {
firePropertyChanged(P_TYPE, oldValue, type);
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISite#getType()
*/
public String getType() {
return type;
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISite#setURL(java.net.URL)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISite#setURL(java.lang.String)
*/
public void setURL(String url) throws CoreException {
ensureModelEditable();
@@ -62,15 +62,15 @@ public class Site extends SiteObject implements ISite {
firePropertyChanged(P_URL, oldValue, url);
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISite#getURL()
*/
public String getURL() {
return url;
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISite#setDigestURL(String)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISite#setDigestURL(java.lang.String)
*/
public void setDigestURL(String url) throws CoreException {
ensureModelEditable();
@@ -79,15 +79,15 @@ public class Site extends SiteObject implements ISite {
firePropertyChanged(P_DIGEST_URL, oldValue, url);
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISite#getDigestURL()
*/
public String getDigestURL() {
return digestUrl;
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISite#setAssociateSitesURL(String)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISite#setAssociateSitesURL(java.lang.String)
*/
public void setAssociateSitesURL(String url) throws CoreException {
ensureModelEditable();
@@ -96,15 +96,15 @@ public class Site extends SiteObject implements ISite {
firePropertyChanged(P_ASSOCIATE_SITES_URL, oldValue, url);
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISite#getAssociateSitesURL()
*/
public String getAssociateSitesURL() {
return associateSitesUrl;
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISite#setMirrorsURL(String)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISite#setMirrorsURL(java.lang.String)
*/
public void setMirrorsURL(String url) throws CoreException {
ensureModelEditable();
@@ -113,21 +113,21 @@ public class Site extends SiteObject implements ISite {
firePropertyChanged(P_MIRRORS_URL, oldValue, url);
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISite#getMirrorsURL()
*/
public String getMirrorsURL() {
return mirrorsUrl;
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISite#getDescription()
*/
public ISiteDescription getDescription() {
return description;
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISite#setDescription(org.eclipse.pde.internal.core.isite.ISiteDescription)
*/
public void setDescription(ISiteDescription description) throws CoreException {
@@ -137,8 +137,8 @@ public class Site extends SiteObject implements ISite {
firePropertyChanged(P_DESCRIPTION, oldValue, description);
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISite#addFeatures(org.eclipse.pde.internal.core.isite.ISiteFeature)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISite#addFeatures(org.eclipse.pde.internal.core.isite.ISiteFeature[])
*/
public void addFeatures(ISiteFeature[] newFeatures) throws CoreException {
ensureModelEditable();
@@ -150,8 +150,8 @@ public class Site extends SiteObject implements ISite {
fireStructureChanged(newFeatures, IModelChangedEvent.INSERT);
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISite#addBundles(org.eclipse.pde.internal.core.isite.ISiteBundle)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISite#addBundles(org.eclipse.pde.internal.core.isite.ISiteBundle[])
*/
public void addBundles(ISiteBundle[] newBundles) throws CoreException {
ensureModelEditable();
@@ -163,8 +163,8 @@ public class Site extends SiteObject implements ISite {
fireStructureChanged(newBundles, IModelChangedEvent.INSERT);
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISite#addArchives(org.eclipse.pde.internal.core.isite.ISiteArchive)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISite#addArchives(org.eclipse.pde.internal.core.isite.ISiteArchive[])
*/
public void addArchives(ISiteArchive[] archs) throws CoreException {
ensureModelEditable();
@@ -176,8 +176,8 @@ public class Site extends SiteObject implements ISite {
fireStructureChanged(archs, IModelChangedEvent.INSERT);
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISite#addCategoryDefinitions(org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISite#addCategoryDefinitions(org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition[])
*/
public void addCategoryDefinitions(ISiteCategoryDefinition[] defs) throws CoreException {
ensureModelEditable();
@@ -189,8 +189,8 @@ public class Site extends SiteObject implements ISite {
fireStructureChanged(defs, IModelChangedEvent.INSERT);
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISite#removeFeatures(org.eclipse.pde.internal.core.isite.ISiteFeature)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISite#removeFeatures(org.eclipse.pde.internal.core.isite.ISiteFeature[])
*/
public void removeFeatures(ISiteFeature[] newFeatures) throws CoreException {
ensureModelEditable();
@@ -202,8 +202,8 @@ public class Site extends SiteObject implements ISite {
fireStructureChanged(newFeatures, IModelChangedEvent.REMOVE);
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISite#removeBundles(org.eclipse.pde.internal.core.isite.ISiteBundle)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISite#removeBundles(org.eclipse.pde.internal.core.isite.ISiteBundle[])
*/
public void removeBundles(ISiteBundle[] newBundles) throws CoreException {
ensureModelEditable();
@@ -215,8 +215,8 @@ public class Site extends SiteObject implements ISite {
fireStructureChanged(newBundles, IModelChangedEvent.REMOVE);
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISite#removeArchives(org.eclipse.pde.internal.core.isite.ISiteArchive)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISite#removeArchives(org.eclipse.pde.internal.core.isite.ISiteArchive[])
*/
public void removeArchives(ISiteArchive[] archs) throws CoreException {
ensureModelEditable();
@@ -228,8 +228,8 @@ public class Site extends SiteObject implements ISite {
fireStructureChanged(archs, IModelChangedEvent.REMOVE);
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISite#removeCategoryDefinitions(org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISite#removeCategoryDefinitions(org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition[])
*/
public void removeCategoryDefinitions(ISiteCategoryDefinition[] defs) throws CoreException {
ensureModelEditable();
@@ -241,34 +241,38 @@ public class Site extends SiteObject implements ISite {
fireStructureChanged(defs, IModelChangedEvent.REMOVE);
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISite#getFeatures()
*/
public ISiteFeature[] getFeatures() {
return features.toArray(new ISiteFeature[features.size()]);
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISite#getBundles()
*/
public ISiteBundle[] getBundles() {
return bundles.toArray(new ISiteBundle[bundles.size()]);
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISite#getArchives()
*/
public ISiteArchive[] getArchives() {
return archives.toArray(new ISiteArchive[archives.size()]);
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISite#getCategoryDefinitions()
*/
public ISiteCategoryDefinition[] getCategoryDefinitions() {
return categoryDefs.toArray(new ISiteCategoryDefinition[categoryDefs.size()]);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.site.SiteObject#reset()
+ */
+ @Override
protected void reset() {
archives.clear();
categoryDefs.clear();
@@ -282,6 +286,10 @@ public class Site extends SiteObject implements ISite {
associateSitesUrl = null;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.site.SiteObject#parse(org.w3c.dom.Node)
+ */
+ @Override
protected void parse(Node node) {
type = getNodeAttribute(node, P_TYPE);
url = getNodeAttribute(node, P_URL);
@@ -328,6 +336,7 @@ public class Site extends SiteObject implements ISite {
}
}
+ @Override
public void restoreProperty(String name, Object oldValue, Object newValue) throws CoreException {
if (name.equals(P_TYPE)) {
setType(newValue != null ? newValue.toString() : null);
@@ -345,6 +354,7 @@ public class Site extends SiteObject implements ISite {
super.restoreProperty(name, oldValue, newValue);
}
+ @Override
public void write(String indent, PrintWriter writer) {
writer.print(indent + "<site"); //$NON-NLS-1$
String indent2 = indent + INDENT;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteBundle.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteBundle.java
index 18ba224..b91191e 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteBundle.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteBundle.java
@@ -24,6 +24,7 @@ public class SiteBundle extends VersionableObject implements ISiteBundle {
private static final long serialVersionUID = 1L;
private Vector<ISiteCategory> fCategories = new Vector<ISiteCategory>();
+ @Override
public boolean isValid() {
for (int i = 0; i < fCategories.size(); i++) {
ISiteCategory category = fCategories.get(i);
@@ -33,8 +34,8 @@ public class SiteBundle extends VersionableObject implements ISiteBundle {
return true;
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISiteFeature#addCategories(org.eclipse.pde.internal.core.isite.ISiteCategory)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISiteBundle#addCategories(org.eclipse.pde.internal.core.isite.ISiteCategory[])
*/
public void addCategories(ISiteCategory[] newCategories) throws CoreException {
ensureModelEditable();
@@ -46,8 +47,8 @@ public class SiteBundle extends VersionableObject implements ISiteBundle {
fireStructureChanged(newCategories, IModelChangedEvent.INSERT);
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISiteFeature#removeCategories(org.eclipse.pde.internal.core.isite.ISiteCategory)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISiteBundle#removeCategories(org.eclipse.pde.internal.core.isite.ISiteCategory[])
*/
public void removeCategories(ISiteCategory[] newCategories) throws CoreException {
ensureModelEditable();
@@ -66,6 +67,7 @@ public class SiteBundle extends VersionableObject implements ISiteBundle {
return fCategories.toArray(new ISiteCategory[fCategories.size()]);
}
+ @Override
protected void parse(Node node) {
super.parse(node);
NodeList children = node.getChildNodes();
@@ -80,6 +82,7 @@ public class SiteBundle extends VersionableObject implements ISiteBundle {
}
}
+ @Override
protected void reset() {
super.reset();
fCategories.clear();
@@ -88,6 +91,7 @@ public class SiteBundle extends VersionableObject implements ISiteBundle {
/**
* @see org.eclipse.pde.core.IWritable#write(java.lang.String, java.io.PrintWriter)
*/
+ @Override
public void write(String indent, PrintWriter writer) {
writer.print(indent);
writer.print("<bundle"); //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteCategoryDefinition.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteCategoryDefinition.java
index 1322433..73d0280 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteCategoryDefinition.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteCategoryDefinition.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
package org.eclipse.pde.internal.core.site;
import java.io.PrintWriter;
-
import org.eclipse.core.runtime.CoreException;
import org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition;
import org.eclipse.pde.internal.core.isite.ISiteDescription;
@@ -24,18 +23,21 @@ public class SiteCategoryDefinition extends SiteObject implements ISiteCategoryD
private String name;
private ISiteDescription description;
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition#getName()
*/
public String getName() {
return name;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISiteObject#isValid()
+ */
public boolean isValid() {
return name != null && getLabel() != null;
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition#setName(java.lang.String)
*/
public void setName(String name) throws CoreException {
@@ -45,14 +47,14 @@ public class SiteCategoryDefinition extends SiteObject implements ISiteCategoryD
firePropertyChanged(P_NAME, oldValue, name);
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition#getDescription()
*/
public ISiteDescription getDescription() {
return description;
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition#setDescription(org.eclipse.pde.internal.core.isite.ISiteDescription)
*/
public void setDescription(ISiteDescription description) throws CoreException {
@@ -62,12 +64,20 @@ public class SiteCategoryDefinition extends SiteObject implements ISiteCategoryD
firePropertyChanged(P_DESCRIPTION, oldValue, description);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.site.SiteObject#reset()
+ */
+ @Override
protected void reset() {
super.reset();
name = null;
description = null;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.site.SiteObject#parse(org.w3c.dom.Node)
+ */
+ @Override
protected void parse(Node node) {
super.parse(node);
name = getNodeAttribute(node, "name"); //$NON-NLS-1$
@@ -83,6 +93,10 @@ public class SiteCategoryDefinition extends SiteObject implements ISiteCategoryD
}
}
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.site.SiteObject#restoreProperty(java.lang.String, java.lang.Object, java.lang.Object)
+ */
+ @Override
public void restoreProperty(String name, Object oldValue, Object newValue) throws CoreException {
if (name.equals(P_NAME)) {
setName(newValue != null ? newValue.toString() : null);
@@ -92,6 +106,10 @@ public class SiteCategoryDefinition extends SiteObject implements ISiteCategoryD
super.restoreProperty(name, oldValue, newValue);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.site.SiteObject#write(java.lang.String, java.io.PrintWriter)
+ */
+ @Override
public void write(String indent, PrintWriter writer) {
writer.print(indent);
writer.print("<category-def"); //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteFeature.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteFeature.java
index 966097e..5a8064a 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteFeature.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteFeature.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,10 +12,7 @@ package org.eclipse.pde.internal.core.site;
import java.io.PrintWriter;
import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
import org.eclipse.pde.core.IModelChangedEvent;
@@ -35,6 +32,10 @@ public class SiteFeature extends VersionableObject implements ISiteFeature {
private String fNL;
private boolean fIsPatch;
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.site.IdentifiableObject#isValid()
+ */
+ @Override
public boolean isValid() {
if (fUrl == null)
return false;
@@ -46,8 +47,8 @@ public class SiteFeature extends VersionableObject implements ISiteFeature {
return true;
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISiteFeature#addCategories(org.eclipse.pde.internal.core.isite.ISiteCategory)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISiteFeature#addCategories(org.eclipse.pde.internal.core.isite.ISiteCategory[])
*/
public void addCategories(ISiteCategory[] newCategories) throws CoreException {
ensureModelEditable();
@@ -59,8 +60,8 @@ public class SiteFeature extends VersionableObject implements ISiteFeature {
fireStructureChanged(newCategories, IModelChangedEvent.INSERT);
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISiteFeature#removeCategories(org.eclipse.pde.internal.core.isite.ISiteCategory)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISiteFeature#removeCategories(org.eclipse.pde.internal.core.isite.ISiteCategory[])
*/
public void removeCategories(ISiteCategory[] newCategories) throws CoreException {
ensureModelEditable();
@@ -72,28 +73,28 @@ public class SiteFeature extends VersionableObject implements ISiteFeature {
fireStructureChanged(newCategories, IModelChangedEvent.REMOVE);
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISiteFeature#getCategories()
*/
public ISiteCategory[] getCategories() {
return fCategories.toArray(new ISiteCategory[fCategories.size()]);
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISiteFeature#getType()
*/
public String getType() {
return fType;
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISiteFeature#getURL()
*/
public String getURL() {
return fUrl;
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISiteFeature#setType(java.lang.String)
*/
public void setType(String type) throws CoreException {
@@ -103,8 +104,8 @@ public class SiteFeature extends VersionableObject implements ISiteFeature {
firePropertyChanged(P_TYPE, oldValue, fType);
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISiteFeature#setURL(java.net.URL)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISiteFeature#setURL(java.lang.String)
*/
public void setURL(String url) throws CoreException {
ensureModelEditable();
@@ -113,6 +114,10 @@ public class SiteFeature extends VersionableObject implements ISiteFeature {
firePropertyChanged(P_TYPE, oldValue, url);
}
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.site.VersionableObject#parse(org.w3c.dom.Node)
+ */
+ @Override
protected void parse(Node node) {
super.parse(node);
fType = getNodeAttribute(node, "type"); //$NON-NLS-1$
@@ -135,6 +140,10 @@ public class SiteFeature extends VersionableObject implements ISiteFeature {
}
}
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.site.VersionableObject#reset()
+ */
+ @Override
protected void reset() {
super.reset();
fType = null;
@@ -147,6 +156,10 @@ public class SiteFeature extends VersionableObject implements ISiteFeature {
fCategories.clear();
}
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.site.VersionableObject#restoreProperty(java.lang.String, java.lang.Object, java.lang.Object)
+ */
+ @Override
public void restoreProperty(String name, Object oldValue, Object newValue) throws CoreException {
if (name.equals(P_TYPE)) {
setType(newValue != null ? newValue.toString() : null);
@@ -167,9 +180,10 @@ public class SiteFeature extends VersionableObject implements ISiteFeature {
}
}
- /**
- * @see org.eclipse.pde.core.IWritable#write(java.lang.String, java.io.PrintWriter)
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.site.SiteObject#write(java.lang.String, java.io.PrintWriter)
*/
+ @Override
public void write(String indent, PrintWriter writer) {
writer.print(indent);
writer.print("<feature"); //$NON-NLS-1$
@@ -205,6 +219,9 @@ public class SiteFeature extends VersionableObject implements ISiteFeature {
writer.println("/>"); //$NON-NLS-1$
}
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISiteFeature#getArchiveFile()
+ */
public IFile getArchiveFile() {
if (fUrl == null)
return null;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteModelFactory.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteModelFactory.java
index a0c99ce..3105a07 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteModelFactory.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteModelFactory.java
@@ -19,7 +19,7 @@ public class SiteModelFactory implements ISiteModelFactory {
this.model = model;
}
- /**
+ /* (non-Javadoc)
* @see org.eclipse.pde.internal.core.isite.ISiteModelFactory#createSite()
*/
public ISite createSite() {
@@ -29,9 +29,6 @@ public class SiteModelFactory implements ISiteModelFactory {
return site;
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISiteModelFactory#createFeature()
- */
public ISiteFeature createFeature() {
SiteFeature feature = new SiteFeature();
feature.model = model;
@@ -39,9 +36,6 @@ public class SiteModelFactory implements ISiteModelFactory {
return feature;
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISiteModelFactory#createBundle()
- */
public ISiteBundle createBundle() {
SiteBundle bundle = new SiteBundle();
bundle.model = model;
@@ -49,9 +43,6 @@ public class SiteModelFactory implements ISiteModelFactory {
return bundle;
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISiteModelFactory#createCategory()
- */
public ISiteCategory createCategory(ISiteFeature feature) {
SiteCategory category = new SiteCategory();
category.model = model;
@@ -59,9 +50,6 @@ public class SiteModelFactory implements ISiteModelFactory {
return category;
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISiteModelFactory#createCategory()
- */
public ISiteCategory createCategory(ISiteBundle bundle) {
SiteCategory category = new SiteCategory();
category.model = model;
@@ -69,9 +57,6 @@ public class SiteModelFactory implements ISiteModelFactory {
return category;
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISiteModelFactory#createCategoryDefinition()
- */
public ISiteCategoryDefinition createCategoryDefinition() {
SiteCategoryDefinition def = new SiteCategoryDefinition();
def.model = model;
@@ -79,8 +64,8 @@ public class SiteModelFactory implements ISiteModelFactory {
return def;
}
- /**
- * @see org.eclipse.pde.internal.core.isite.ISiteModelFactory#createDescription()
+ /* (non-Javadoc)
+ * @see org.eclipse.pde.internal.core.isite.ISiteModelFactory#createDescription(org.eclipse.pde.internal.core.isite.ISiteObject)
*/
public ISiteDescription createDescription(ISiteObject parent) {
SiteDescription desc = new SiteDescription();
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/IUBundleContainer.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/IUBundleContainer.java
index 259fe1d..6587b7f 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/IUBundleContainer.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/IUBundleContainer.java
@@ -62,7 +62,7 @@ public class IUBundleContainer extends AbstractBundleContainer {
/**
* Whether this container should download and include environment (platform) specific units for all
* available platforms (vs only the current target definition's environment settings). Only supported
- * by the slicer so {@link fIncludeAllRequired} must be turned off for this setting to be used.
+ * by the slicer so {@link #INCLUDE_REQUIRED} must be turned off for this setting to be used.
*/
public static final int INCLUDE_ALL_ENVIRONMENTS = 1 << 1;
@@ -163,6 +163,7 @@ public class IUBundleContainer extends AbstractBundleContainer {
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer#getLocation(boolean)
*/
+ @Override
public String getLocation(boolean resolve) throws CoreException {
return P2TargetUtils.BUNDLE_POOL.toOSString();
}
@@ -170,6 +171,7 @@ public class IUBundleContainer extends AbstractBundleContainer {
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer#getType()
*/
+ @Override
public String getType() {
return TYPE;
}
@@ -177,6 +179,7 @@ public class IUBundleContainer extends AbstractBundleContainer {
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.target.AbstractBundleContainer#resolveFeatures(org.eclipse.pde.core.target.ITargetDefinition, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected TargetFeature[] resolveFeatures(ITargetDefinition definition, IProgressMonitor monitor) throws CoreException {
fTarget = definition;
fSynchronizer.synchronize(definition, monitor);
@@ -244,6 +247,7 @@ public class IUBundleContainer extends AbstractBundleContainer {
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer#resolveBundles(org.eclipse.pde.core.target.ITargetDefinition, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected TargetBundle[] resolveBundles(ITargetDefinition definition, IProgressMonitor monitor) throws CoreException {
fTarget = definition;
fSynchronizer.synchronize(definition, monitor);
@@ -368,6 +372,7 @@ public class IUBundleContainer extends AbstractBundleContainer {
return updated;
}
+ @Override
protected void clearResolutionStatus() {
super.clearResolutionStatus();
fSynchronizer.markDirty();
@@ -422,6 +427,7 @@ public class IUBundleContainer extends AbstractBundleContainer {
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.target.AbstractBundleContainer#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object o) {
if (o instanceof IUBundleContainer) {
IUBundleContainer iuContainer = (IUBundleContainer) o;
@@ -438,6 +444,7 @@ public class IUBundleContainer extends AbstractBundleContainer {
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.target.AbstractBundleContainer#hashCode()
*/
+ @Override
public int hashCode() {
boolean result = true;
result &= getIncludeAllRequired();
@@ -625,6 +632,7 @@ public class IUBundleContainer extends AbstractBundleContainer {
* Associate this container with the given target. The include settings for this container
* override the settings for all other IU containers in the target. Last one wins.
*/
+ @Override
protected void associateWithTarget(ITargetDefinition target) {
super.associateWithTarget(target);
fSynchronizer = getSynchronizer(target);
@@ -639,6 +647,7 @@ public class IUBundleContainer extends AbstractBundleContainer {
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.target.AbstractBundleContainer#serialize()
*/
+ @Override
public String serialize() {
Element containerElement;
Document document;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/LocalTargetHandle.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/LocalTargetHandle.java
index 86aa98d..a89d330 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/LocalTargetHandle.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/LocalTargetHandle.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2011 IBM Corporation and others.
+ * Copyright (c) 2008, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,14 +10,13 @@
*******************************************************************************/
package org.eclipse.pde.internal.core.target;
-import org.eclipse.pde.core.target.ITargetDefinition;
-import org.eclipse.pde.core.target.ITargetHandle;
-
import java.io.*;
import java.net.URI;
import java.net.URISyntaxException;
import org.eclipse.core.runtime.*;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.pde.core.target.ITargetDefinition;
+import org.eclipse.pde.core.target.ITargetHandle;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.PDECore;
@@ -68,7 +67,7 @@ public class LocalTargetHandle extends AbstractTargetHandle {
*
* @param uri URI
* @return handle to a target in local metadata
- * @exception if unable to restore
+ * @exception CoreException if unable to restore
*/
static ITargetHandle restoreHandle(URI uri) throws CoreException {
String part = uri.getSchemeSpecificPart();
@@ -105,6 +104,7 @@ public class LocalTargetHandle extends AbstractTargetHandle {
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.target.impl.AbstractTargetHandle#getInputStream()
*/
+ @Override
protected InputStream getInputStream() throws CoreException {
try {
return new BufferedInputStream(new FileInputStream(getFile()));
@@ -148,6 +148,7 @@ public class LocalTargetHandle extends AbstractTargetHandle {
/* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj) {
if (obj instanceof LocalTargetHandle) {
LocalTargetHandle handle = (LocalTargetHandle) obj;
@@ -159,6 +160,7 @@ public class LocalTargetHandle extends AbstractTargetHandle {
/* (non-Javadoc)
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode() {
return (int) fTimeStamp;
}
@@ -166,6 +168,7 @@ public class LocalTargetHandle extends AbstractTargetHandle {
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.target.impl.AbstractTargetHandle#delete()
*/
+ @Override
void delete() throws CoreException {
File file = getFile();
if (file.exists()) {
@@ -198,6 +201,7 @@ public class LocalTargetHandle extends AbstractTargetHandle {
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.target.impl.AbstractTargetHandle#save(org.eclipse.pde.core.target.ITargetDefinition)
*/
+ @Override
void save(ITargetDefinition definition) throws CoreException {
OutputStream stream = getOutputStream();
((TargetDefinition) definition).write(stream);
@@ -211,6 +215,7 @@ public class LocalTargetHandle extends AbstractTargetHandle {
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
+ @Override
public String toString() {
return getFile().getName();
}
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java
index da9e5d6..1846a83 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2012 EclipseSource Inc. and others.
+ * Copyright (c) 2010, 2013 EclipseSource Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* EclipseSource Inc. - initial API and implementation
+ * IBM Corporation - ongoing enhancements
*******************************************************************************/
package org.eclipse.pde.internal.core.target;
@@ -127,7 +128,7 @@ public class P2TargetUtils {
/**
* Whether this container should download and include environment (platform) specific units for all
* available platforms (vs only the current target definition's environment settings). Only supported
- * by the slicer so {@link fIncludeAllRequired} must be turned off for this setting to be used.
+ * by the slicer so {@link IUBundleContainer#INCLUDE_REQUIRED} must be turned off for this setting to be used.
* <p>
* <code>false</code> by default
* </p>
@@ -790,7 +791,6 @@ public class P2TargetUtils {
* per target definition.
*
* @return definition the target to lookup
- * @throws CoreException in unable to generate identifier
*/
public static String getProfileId(ITargetDefinition definition) {
try {
@@ -1208,7 +1208,7 @@ public class P2TargetUtils {
// If the slicer encounters a non-error status, only report it if the slice returned no IU results
// It would be better to inform the user, but we do not want to stop the location from resolving (bug 350772)
if (!sliceStatus.isOK()) {
- if (!queryResult.iterator().hasNext()) {
+ if (queryResult != null && !queryResult.iterator().hasNext()) {
throw new CoreException(sliceStatus);
}
}
@@ -1318,7 +1318,7 @@ public class P2TargetUtils {
/**
* Returns the IU's for the given target related to the given containers
*
- * @param containers the bundle containers to filter with
+ * @param definition the definition to filter with
* @return the discovered IUs
* @exception CoreException if unable to retrieve IU's
*/
@@ -1373,6 +1373,7 @@ public class P2TargetUtils {
private static final String PARM_OPERAND = "operand"; //$NON-NLS-1$
protected static class CollectNativesAction extends ProvisioningAction {
+ @Override
public IStatus execute(Map<String, Object> parameters) {
InstallableUnitOperand operand = (InstallableUnitOperand) parameters.get(PARM_OPERAND);
IInstallableUnit installableUnit = operand.second();
@@ -1400,6 +1401,7 @@ public class P2TargetUtils {
return Status.OK_STATUS;
}
+ @Override
public IStatus undo(Map<String, Object> parameters) {
// nothing to do for now
return Status.OK_STATUS;
@@ -1411,6 +1413,7 @@ public class P2TargetUtils {
super(NATIVE_ARTIFACTS, weight);
}
+ @Override
protected List<ProvisioningAction> getActions(InstallableUnitOperand operand) {
IInstallableUnit unit = operand.second();
if (unit != null && unit.getTouchpointType().getId().equals(NATIVE_TYPE)) {
@@ -1421,12 +1424,14 @@ public class P2TargetUtils {
return null;
}
+ @Override
protected IStatus initializePhase(IProgressMonitor monitor, IProfile profile, Map<String, Object> parameters) {
parameters.put(NATIVE_ARTIFACTS, new ArrayList<Object>());
parameters.put(PARM_PROFILE, profile);
return null;
}
+ @Override
protected IStatus completePhase(IProgressMonitor monitor, IProfile profile, Map<String, Object> parameters) {
@SuppressWarnings("unchecked")
List<IArtifactRequest> artifactRequests = (List<IArtifactRequest>) parameters.get(NATIVE_ARTIFACTS);
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPersistence35Helper.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPersistence35Helper.java
index a47bfeb..406114f 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPersistence35Helper.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPersistence35Helper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2012 IBM Corporation and others.
+ * Copyright (c) 2010, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.pde.internal.core.target;
-import org.eclipse.pde.core.target.NameVersionDescriptor;
-
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
@@ -169,9 +167,8 @@ public class TargetPersistence35Helper {
* to the appropriate set (in 3.5 each container had included/optional, in 3.6 only the target has included/optional). The
* sets may be null to indicate that no container has specified inclusion restrictions yet.
*
+ * @param definition the target definition to deserialize
* @param location document element representing a bundle container
- * @param included set to contain included bundles, possibly <code>null</code>
- * @param optional set to contain optional bundles, possible <code>null</code>
* @throws CoreException
*/
private static void deserializeBundleContainer(ITargetDefinition definition, Element location) throws CoreException {
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPlatformService.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPlatformService.java
index 6430049..0e46e8b 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPlatformService.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPlatformService.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2012 IBM Corporation and others.
+ * Copyright (c) 2008, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,11 +10,6 @@
*******************************************************************************/
package org.eclipse.pde.internal.core.target;
-import java.net.URI;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.pde.core.target.ITargetHandle;
-import org.eclipse.pde.core.target.NameVersionDescriptor;
-
import java.io.*;
import java.net.*;
import java.util.*;
@@ -311,7 +306,7 @@ public class TargetPlatformService implements ITargetPlatformService {
* preference settings (target platform settings). It is not part of the service API since
* the preference settings should eventually be removed.
*
- * @param definition target definition
+ * @param target target definition
* @throws CoreException
*/
public void loadTargetDefinitionFromPreferences(ITargetDefinition target) throws CoreException {
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/IdUtil.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/IdUtil.java
index 454a131..fc15ad6 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/IdUtil.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/IdUtil.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * Copyright (c) 2005, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -102,7 +102,7 @@ public class IdUtil {
/**
* @param point
- * @param fModel
+ * @param model
*/
public static String getFullId(IPluginExtensionPoint point, IPluginModelBase model) {
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/PDEHTMLHelper.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/PDEHTMLHelper.java
index dbae0c5..89623de 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/PDEHTMLHelper.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/PDEHTMLHelper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
+ * Copyright (c) 2006, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -39,7 +39,7 @@ public class PDEHTMLHelper {
StringBuffer sb = new StringBuffer(length);
boolean processingEntity = false;
- StringBuffer entityBuffer = null;
+ StringBuffer entityBuffer = new StringBuffer();
for (int i = 0; i < length; i++) {
char curr = html.charAt(i);
diff --git a/ui/org.eclipse.pde.core/text/org/eclipse/pde/internal/core/text/DocumentElementNode.java b/ui/org.eclipse.pde.core/text/org/eclipse/pde/internal/core/text/DocumentElementNode.java
index 438e5cf..d2f6db8 100644
--- a/ui/org.eclipse.pde.core/text/org/eclipse/pde/internal/core/text/DocumentElementNode.java
+++ b/ui/org.eclipse.pde.core/text/org/eclipse/pde/internal/core/text/DocumentElementNode.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -533,10 +533,6 @@ public abstract class DocumentElementNode extends DocumentXMLNode implements IDo
reconnectChildren(model);
}
- /**
- * @param model
- * @param schema
- */
private void reconnectAttributes() {
// Get all attributes
Iterator<String> keys = fAttributes.keySet().iterator();
@@ -550,7 +546,6 @@ public abstract class DocumentElementNode extends DocumentXMLNode implements IDo
/**
* @param model
- * @param schema
*/
private void reconnectChildren(IModel model) {
// Fill in appropriate transient field values
@@ -583,9 +578,6 @@ public abstract class DocumentElementNode extends DocumentXMLNode implements IDo
fParent = parent;
}
- /**
- * @param parent
- */
private void reconnectPreviousSibling() {
// Transient field: Previous Sibling
linkNodeWithSiblings(this);
@@ -593,7 +585,7 @@ public abstract class DocumentElementNode extends DocumentXMLNode implements IDo
/**
* PRE: Node must have a set parent
- * @param node
+ * @param targetNode
*/
private void linkNodeWithSiblings(IDocumentElementNode targetNode) {
// Get the node's parent
@@ -829,6 +821,7 @@ public abstract class DocumentElementNode extends DocumentXMLNode implements IDo
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.text.DocumentXMLNode#write()
*/
+ @Override
public String write() {
return write(false);
}
diff --git a/ui/org.eclipse.pde.core/text/org/eclipse/pde/internal/core/text/DocumentObject.java b/ui/org.eclipse.pde.core/text/org/eclipse/pde/internal/core/text/DocumentObject.java
index cd083e2..8020ca9 100644
--- a/ui/org.eclipse.pde.core/text/org/eclipse/pde/internal/core/text/DocumentObject.java
+++ b/ui/org.eclipse.pde.core/text/org/eclipse/pde/internal/core/text/DocumentObject.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 IBM Corporation and others.
+ * Copyright (c) 2007, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -100,6 +100,7 @@ public abstract class DocumentObject extends DocumentElementNode implements IDoc
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.text.IDocumentObject#getLineDelimiter()
*/
+ @Override
protected String getLineDelimiter() {
if (fModel instanceof IEditingModel) {
IDocument document = ((IEditingModel) fModel).getDocument();
@@ -111,6 +112,7 @@ public abstract class DocumentObject extends DocumentElementNode implements IDoc
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.text.plugin.PluginDocumentNode#reconnect(org.eclipse.pde.core.plugin.ISharedPluginModel, org.eclipse.pde.internal.core.ischema.ISchema, org.eclipse.pde.internal.core.text.IDocumentElementNode)
*/
+ @Override
public void reconnect(IDocumentElementNode parent, IModel model) {
super.reconnect(parent, model);
// Transient field: In The Model
@@ -168,6 +170,7 @@ public abstract class DocumentObject extends DocumentElementNode implements IDoc
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.text.plugin.PluginDocumentNode#addChildNode(org.eclipse.pde.internal.core.text.IDocumentElementNode)
*/
+ @Override
public void addChildNode(IDocumentElementNode child) {
if (child instanceof IDocumentObject) {
((IDocumentObject) child).setInTheModel(true);
@@ -178,6 +181,7 @@ public abstract class DocumentObject extends DocumentElementNode implements IDoc
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.text.plugin.PluginDocumentNode#addChildNode(org.eclipse.pde.internal.core.text.IDocumentElementNode, int)
*/
+ @Override
public void addChildNode(IDocumentElementNode child, int position) {
// Ensure the position is valid
// 0 <= position <= number of children
@@ -218,6 +222,7 @@ public abstract class DocumentObject extends DocumentElementNode implements IDoc
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.text.plugin.PluginDocumentNode#removeChildNode(org.eclipse.pde.internal.core.text.IDocumentElementNode)
*/
+ @Override
public IDocumentElementNode removeChildNode(IDocumentElementNode child) {
IDocumentElementNode node = super.removeChildNode(child);
if ((node != null) && (node instanceof IDocumentObject)) {
@@ -229,6 +234,7 @@ public abstract class DocumentObject extends DocumentElementNode implements IDoc
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.text.plugin.PluginDocumentNode#removeChildNode(int)
*/
+ @Override
public IDocumentElementNode removeChildNode(int index) {
IDocumentElementNode node = super.removeChildNode(index);
if ((node != null) && (node instanceof IDocumentObject)) {
@@ -277,7 +283,7 @@ public abstract class DocumentObject extends DocumentElementNode implements IDoc
/**
* @param newNode
- * @param oldNode
+ * @param clazz
*/
public void setChildNode(IDocumentElementNode newNode, Class<?> clazz) {
// Determine whether to fire the event
@@ -569,6 +575,7 @@ public abstract class DocumentObject extends DocumentElementNode implements IDoc
return setXMLAttribute(name, newValue);
}
+ @Override
public boolean setXMLAttribute(String name, String newValue) {
String oldValue = getXMLAttributeValue(name);
boolean changed = super.setXMLAttribute(name, newValue);
@@ -582,6 +589,7 @@ public abstract class DocumentObject extends DocumentElementNode implements IDoc
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.text.plugin.PluginDocumentNode#setXMLContent(java.lang.String)
*/
+ @Override
public boolean setXMLContent(String text) {
String oldText = null;
// Get old text node
@@ -609,6 +617,7 @@ public abstract class DocumentObject extends DocumentElementNode implements IDoc
/* (non-Javadoc)
* @see org.eclipse.pde.internal.core.text.plugin.PluginDocumentNode#getFileEncoding()
*/
+ @Override
protected String getFileEncoding() {
if ((fModel != null) && (fModel instanceof IEditingModel)) {
return ((IEditingModel) fModel).getCharset();
diff --git a/ui/org.eclipse.pde.launching/.settings/org.eclipse.jdt.ui.prefs b/ui/org.eclipse.pde.launching/.settings/org.eclipse.jdt.ui.prefs
index 4079175..87ab70a 100644
--- a/ui/org.eclipse.pde.launching/.settings/org.eclipse.jdt.ui.prefs
+++ b/ui/org.eclipse.pde.launching/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,3 @@
-#Sun Dec 23 21:49:35 CST 2007
eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
formatter_profile=_core
@@ -14,6 +13,7 @@ sp_cleanup.add_missing_deprecated_annotations=true
sp_cleanup.add_missing_methods=false
sp_cleanup.add_missing_nls_tags=false
sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
sp_cleanup.add_serial_version_id=false
sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
@@ -26,10 +26,11 @@ sp_cleanup.format_source_code_changes_only=false
sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
@@ -37,12 +38,12 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
sp_cleanup.remove_unused_local_variables=false
sp_cleanup.remove_unused_private_fields=true
sp_cleanup.remove_unused_private_members=false
diff --git a/ui/org.eclipse.pde.launching/.settings/org.eclipse.pde.prefs b/ui/org.eclipse.pde.launching/.settings/org.eclipse.pde.prefs
index 88a12c6..796ada1 100644
--- a/ui/org.eclipse.pde.launching/.settings/org.eclipse.pde.prefs
+++ b/ui/org.eclipse.pde.launching/.settings/org.eclipse.pde.prefs
@@ -17,7 +17,7 @@ compilers.p.matching-pom-version=0
compilers.p.missing-packages=0
compilers.p.missing-version-export-package=2
compilers.p.missing-version-import-package=2
-compilers.p.missing-version-require-bundle=2
+compilers.p.missing-version-require-bundle=1
compilers.p.no-required-att=0
compilers.p.not-externalized-att=1
compilers.p.unknown-attribute=1
diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchValidationOperation.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchValidationOperation.java
index 948746d..6fab15d 100644
--- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchValidationOperation.java
+++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchValidationOperation.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
+ * Copyright (c) 2007, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -108,7 +108,6 @@ public abstract class LaunchValidationOperation implements IWorkspaceRunnable {
if (file.exists())
is = new FileInputStream(file);
} else {
- zipFile = null;
try {
zipFile = new ZipFile(location, ZipFile.OPEN_READ);
ZipEntry entry = zipFile.getEntry(filename);
diff --git a/ui/org.eclipse.pde.ui.tests/.settings/.api_filters b/ui/org.eclipse.pde.ui.tests/.settings/.api_filters
new file mode 100644
index 0000000..3c39efa
--- /dev/null
+++ b/ui/org.eclipse.pde.ui.tests/.settings/.api_filters
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.pde.ui.tests" version="2">
+ <resource path="src/org/eclipse/pde/ui/tests/project/BundleImporterTests.java" type="org.eclipse.pde.ui.tests.project.BundleImporterTests">
+ <filter comment="Use of experimental Platform Team code necessary for import from source repository" id="640712815">
+ <message_arguments>
+ <message_argument value="Team"/>
+ <message_argument value="BundleImporterTests"/>
+ <message_argument value="getBundleImporters()"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.jdt.core.prefs b/ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.jdt.core.prefs
index a47809a..a161bb8 100644
--- a/ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -36,7 +36,10 @@ org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
@@ -45,7 +48,9 @@ org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
diff --git a/ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.jdt.ui.prefs
index ef6298d..c631c95 100644
--- a/ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -7,7 +7,7 @@ org.eclipse.jdt.ui.ondemandthreshold=3
org.eclipse.jdt.ui.staticondemandthreshold=99
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_annotations=false
sp_cleanup.add_missing_deprecated_annotations=true
sp_cleanup.add_missing_methods=false
sp_cleanup.add_missing_nls_tags=false
@@ -19,17 +19,17 @@ sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=false
-sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.correct_indentation=true
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.make_variable_declarations_final=false
sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
@@ -37,12 +37,12 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
sp_cleanup.remove_unused_local_variables=false
sp_cleanup.remove_unused_private_fields=true
sp_cleanup.remove_unused_private_members=false
diff --git a/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF
index 2d87bbd..240d830 100644
--- a/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: PDE JUnit Tests
Bundle-SymbolicName: org.eclipse.pde.ui.tests; singleton:=true
-Bundle-Version: 3.1.400.qualifier
+Bundle-Version: 3.1.500.qualifier
Bundle-ClassPath: tests.jar
Bundle-Activator: org.eclipse.pde.internal.ui.tests.macro.MacroPlugin
Bundle-Vendor: Eclipse.org
diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/AbstractStructuredCommand.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/AbstractStructuredCommand.java
index 96fd299..7091323 100644
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/AbstractStructuredCommand.java
+++ b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/AbstractStructuredCommand.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,20 +13,11 @@ package org.eclipse.pde.internal.ui.tests.macro;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Hashtable;
-
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.swt.custom.TableTree;
import org.eclipse.swt.custom.TableTreeItem;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.swt.widgets.Widget;
+import org.eclipse.swt.widgets.*;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -47,7 +38,7 @@ public abstract class AbstractStructuredCommand extends MacroCommand {
protected Widget[] getItemsForEvent(Event e) {
Widget item = null;
if (e.item != null)
- item = (Widget) e.item;
+ item = e.item;
else if (e.widget instanceof Item)
item = e.widget;
if (item != null)
diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/BooleanSelectionCommand.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/BooleanSelectionCommand.java
index 583c068..ee8a20c 100644
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/BooleanSelectionCommand.java
+++ b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/BooleanSelectionCommand.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,19 +13,12 @@ package org.eclipse.pde.internal.ui.tests.macro;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Hashtable;
-
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.action.ContributionItem;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Widget;
+import org.eclipse.swt.widgets.*;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -140,7 +133,7 @@ public class BooleanSelectionCommand extends MacroCommand {
return true;
}
- private void doClick(Widget widget) throws CoreException {
+ private void doClick(Widget widget) {
Event e = new Event();
e.type = SWT.Selection;
e.widget = widget;
@@ -155,7 +148,7 @@ public class BooleanSelectionCommand extends MacroCommand {
return e;
}
- private void doSelect(Widget widget) throws CoreException {
+ private void doSelect(Widget widget) {
if (widget instanceof Button)
((Button) widget).setSelection(selection.booleanValue());
else if (widget instanceof ToolItem)
diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroUtil.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroUtil.java
index ec642c9..1e6ce8e 100644
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroUtil.java
+++ b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroUtil.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,46 +12,15 @@ package org.eclipse.pde.internal.ui.tests.macro;
import java.util.ArrayList;
import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.CoolBarManager;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.ICoolBarManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.ToolBarContributionItem;
-import org.eclipse.jface.action.ToolBarManager;
+import org.eclipse.core.runtime.*;
+import org.eclipse.jface.action.*;
import org.eclipse.jface.window.ApplicationWindow;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.CoolBar;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IPluginContribution;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.ui.*;
import org.eclipse.ui.internal.WorkbenchPartReference;
import org.eclipse.ui.keys.SWTKeySupport;
import org.w3c.dom.Node;
@@ -403,12 +372,7 @@ public class MacroUtil {
return "contribclass/" + contrib.getClass().getName(); //$NON-NLS-1$
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.instrumentation.IDataProvider#getDefaultValue(org.eclipse.core.runtime.IPath)
- */
- public Object getDefaultValue(IPath node) throws CoreException {
+ public Object getDefaultValue(IPath node) {
return null;
}
@@ -627,7 +591,7 @@ public class MacroUtil {
midpoint = c.toDisplay(midpoint);
menu.setLocation(midpoint);
}
- */
+ */
//menu.setVisible(true);
menu.notifyListeners(e.type, e);
processDisplayEvents(menu.getDisplay());
diff --git a/ui/org.eclipse.pde.ui.tests/pom.xml b/ui/org.eclipse.pde.ui.tests/pom.xml
index e22dd03..fbe1512 100644
--- a/ui/org.eclipse.pde.ui.tests/pom.xml
+++ b/ui/org.eclipse.pde.ui.tests/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.pde</groupId>
<artifactId>org.eclipse.pde.ui.tests</artifactId>
- <version>3.1.400-SNAPSHOT</version>
+ <version>3.1.500-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
</project>
diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/preferences/PDEPreferencesTestCase.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/preferences/PDEPreferencesTestCase.java
index 5ac9868..1232249 100644
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/preferences/PDEPreferencesTestCase.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/preferences/PDEPreferencesTestCase.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2011 IBM Corporation and others.
+ * Copyright (c) 2009, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -21,6 +21,7 @@ import org.eclipse.pde.core.plugin.TargetPlatform;
import org.eclipse.pde.internal.core.*;
import org.eclipse.pde.internal.core.builders.CompilerFlags;
import org.eclipse.pde.internal.core.natures.PDE;
+import org.eclipse.pde.internal.launching.ILaunchingPreferenceConstants;
import org.eclipse.pde.internal.ui.*;
@@ -30,12 +31,12 @@ import org.eclipse.pde.internal.ui.*;
*/
public class PDEPreferencesTestCase extends TestCase {
- private static final String PLUGIN_ID = "org.eclipse.pde.core";
-
+ private static final String PLUGIN_ID = "org.eclipse.pde.core";
+
public PDEPreferencesTestCase(){
initPreferences();
}
-
+
private static void initPreferences(){
PDEPreferencesManager preferences = new PDEPreferencesManager(PLUGIN_ID);
preferences.setValue("stringKey", "stringValue");
@@ -50,31 +51,31 @@ public class PDEPreferencesTestCase extends TestCase {
public static Test suite() {
return new TestSuite(PDEPreferencesTestCase.class);
}
-
+
public void testInstanceScopePDEPreferences(){
PDEPreferencesManager preferences = new PDEPreferencesManager(PLUGIN_ID);
assertEquals(preferences.getString("stringKey"), "stringValue");
assertEquals(preferences.getBoolean("booleanKey"), true);
assertEquals(preferences.getInt("intKey"), 0);
}
-
+
public void testDefaultPDEPreferences(){
PDEPreferencesManager preferences = new PDEPreferencesManager(PLUGIN_ID);
assertEquals(preferences.getDefaultString("stringKey"), "defaultValue");
assertEquals(preferences.getDefaultBoolean("booleanKey"), false);
assertEquals(preferences.getDefaultInt("intKey"), -1);
}
-
+
public void testPreferenceChangeListener1(){
IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(PLUGIN_ID);
final String key = "stringKey";
String originalValue = preferences.get(key, key);
IPreferenceChangeListener listener = new IPreferenceChangeListener(){
-
+
public void preferenceChange(PreferenceChangeEvent event) {
assertEquals(event.getKey(), key);
- assertEquals(event.getNewValue(), "stringValue");
+ assertEquals(event.getNewValue(), "stringValue");
}
};
preferences.addPreferenceChangeListener(listener);
@@ -85,20 +86,20 @@ public class PDEPreferencesTestCase extends TestCase {
if (originalValue != key)
preferences.put(key, originalValue);
}
-
+
public void testPreferenceChangeListner2(){
IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(PLUGIN_ID);
final String key = "stringKey";
String originalValue = preferences.get(key, key);
preferences.put(key, "oldStringValue");
-
+
IPreferenceChangeListener listener = new IPreferenceChangeListener(){
-
+
public void preferenceChange(PreferenceChangeEvent event) {
assertEquals(event.getKey(), key);
assertEquals(event.getOldValue(), "oldStringValue");
- assertEquals(event.getNewValue(), "newStringValue");
+ assertEquals(event.getNewValue(), "newStringValue");
}
};
preferences.put(key, "newStringValue");
@@ -108,7 +109,7 @@ public class PDEPreferencesTestCase extends TestCase {
if (originalValue != key)
preferences.put(key, originalValue);
}
-
+
public void testPDECoreDefaultPreferences(){
PDEPreferencesManager preferences = PDECore.getDefault().getPreferencesManager();
assertEquals(preferences.getDefaultString(ICoreConstants.TARGET_MODE), ICoreConstants.VALUE_USE_THIS);
@@ -116,7 +117,7 @@ public class PDEPreferencesTestCase extends TestCase {
assertEquals(preferences.getDefaultString(ICoreConstants.OS), Platform.getOS());
assertEquals(preferences.getDefaultBoolean(ICoreConstants.TARGET_PLATFORM_REALIZATION), TargetPlatform.getDefaultLocation().equals(TargetPlatform.getLocation()));
}
-
+
public void testCompilerPreferences(){
// Testing the compiler preferences set by PDECore in org.eclipse.pde
PDEPreferencesManager preferences = new PDEPreferencesManager(PDE.PLUGIN_ID);
@@ -124,21 +125,21 @@ public class PDEPreferencesTestCase extends TestCase {
assertEquals(preferences.getDefaultInt(CompilerFlags.P_DEPRECATED), CompilerFlags.WARNING);
assertEquals(preferences.getDefaultInt(CompilerFlags.P_MISSING_VERSION_EXP_PKG), CompilerFlags.IGNORE);
}
-
+
public void testPreferencesCompatability(){
- Preferences preferences = PDECore.getDefault().getPluginPreferences();
+ Preferences preferences = PDECore.getDefault().getPluginPreferences();
PDEPreferencesManager preferencesManager = PDECore.getDefault().getPreferencesManager();
assertEquals(preferences.getString(ICoreConstants.TARGET_MODE), preferencesManager.getString(ICoreConstants.TARGET_MODE));
assertEquals(preferences.getString(ICoreConstants.CHECKED_PLUGINS), preferencesManager.getString(ICoreConstants.CHECKED_PLUGINS));
- assertEquals(preferences.getBoolean(ICoreConstants.TARGET_PLATFORM_REALIZATION), preferencesManager.getBoolean(ICoreConstants.TARGET_PLATFORM_REALIZATION));
+ assertEquals(preferences.getBoolean(ICoreConstants.TARGET_PLATFORM_REALIZATION), preferencesManager.getBoolean(ICoreConstants.TARGET_PLATFORM_REALIZATION));
}
-
+
public void testCompatibilityWithPreferenceStore(){
IPreferenceStore store = PDEPlugin.getDefault().getPreferenceStore();
PDEPreferencesManager preferencesManager = new PDEPreferencesManager(IPDEUIConstants.PLUGIN_ID);
assertEquals(store.getString(IPreferenceConstants.PROP_SHOW_OBJECTS),preferencesManager.getString(IPreferenceConstants.PROP_SHOW_OBJECTS));
assertEquals(store.getBoolean(IPreferenceConstants.EDITOR_FOLDING_ENABLED),preferencesManager.getBoolean(IPreferenceConstants.EDITOR_FOLDING_ENABLED));
- assertEquals(store.getBoolean(IPreferenceConstants.PROP_AUTO_MANAGE),preferencesManager.getBoolean(IPreferenceConstants.PROP_AUTO_MANAGE));
+ assertEquals(store.getBoolean(ILaunchingPreferenceConstants.PROP_AUTO_MANAGE), preferencesManager.getBoolean(ILaunchingPreferenceConstants.PROP_AUTO_MANAGE));
}
-
+
}
diff --git a/ui/org.eclipse.pde.ui/.settings/.api_filters b/ui/org.eclipse.pde.ui/.settings/.api_filters
index 8616349..18b37ff 100644
--- a/ui/org.eclipse.pde.ui/.settings/.api_filters
+++ b/ui/org.eclipse.pde.ui/.settings/.api_filters
@@ -9,4 +9,46 @@
</message_arguments>
</filter>
</resource>
+ <resource path="src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java" type="org.eclipse.pde.internal.ui.wizards.imports.PluginImportWizardFirstPage">
+ <filter comment="Required to use experimental Platform Team code to support import from source repository" id="640712815">
+ <message_arguments>
+ <message_argument value="Team"/>
+ <message_argument value="PluginImportWizardFirstPage"/>
+ <message_argument value="getBundleImporters()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Required to use experimental Platform Team code to support import from source repository" id="640712815">
+ <message_arguments>
+ <message_argument value="TeamUI"/>
+ <message_argument value="PluginImportWizardFirstPage"/>
+ <message_argument value="getPages(String)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/pde/ui/launcher/ConfigurationTab.java" type="org.eclipse.pde.ui.launcher.ConfigurationTab">
+ <filter comment="Code was moved to pde.launching, but we can't make breaking API changes" id="574668824">
+ <message_arguments>
+ <message_argument value="IPDELauncherConstants"/>
+ <message_argument value="ConfigurationTab"/>
+ <message_argument value="IPDELauncherConstants"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/pde/ui/launcher/IPDELauncherConstants.java" type="org.eclipse.pde.ui.launcher.IPDELauncherConstants">
+ <filter comment="Code was moved to pde.launching, but we can't make breaking API changes" id="571473929">
+ <message_arguments>
+ <message_argument value="IPDELauncherConstants"/>
+ <message_argument value="IPDELauncherConstants"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/pde/ui/launcher/MainTab.java" type="org.eclipse.pde.ui.launcher.MainTab">
+ <filter comment="Code was moved to pde.launching, but we can't make breaking API changes" id="574668824">
+ <message_arguments>
+ <message_argument value="IPDELauncherConstants"/>
+ <message_argument value="MainTab"/>
+ <message_argument value="IPDELauncherConstants"/>
+ </message_arguments>
+ </filter>
+ </resource>
</component>
diff --git a/ui/org.eclipse.pde.ui/.settings/org.eclipse.pde.prefs b/ui/org.eclipse.pde.ui/.settings/org.eclipse.pde.prefs
index 88a12c6..796ada1 100644
--- a/ui/org.eclipse.pde.ui/.settings/org.eclipse.pde.prefs
+++ b/ui/org.eclipse.pde.ui/.settings/org.eclipse.pde.prefs
@@ -17,7 +17,7 @@ compilers.p.matching-pom-version=0
compilers.p.missing-packages=0
compilers.p.missing-version-export-package=2
compilers.p.missing-version-import-package=2
-compilers.p.missing-version-require-bundle=2
+compilers.p.missing-version-require-bundle=1
compilers.p.no-required-att=0
compilers.p.not-externalized-att=1
compilers.p.unknown-attribute=1
diff --git a/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF
index efbb334..4df3c2c 100644
--- a/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF
@@ -85,6 +85,7 @@ Require-Bundle:
org.eclipse.team.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ant.launching;bundle-version="[1.0.400,2.0.0)",
org.eclipse.ant.ui;bundle-version="[3.1.0,4.0.0)",
org.eclipse.jdt.junit;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.intro;bundle-version="[3.2.0,4.0.0)",
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BaseBuildAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BaseBuildAction.java
index d82c7fa..8992f3e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BaseBuildAction.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BaseBuildAction.java
@@ -13,7 +13,7 @@ package org.eclipse.pde.internal.ui.build;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
import org.eclipse.ant.internal.ui.launchConfigurations.AntLaunchShortcut;
-import org.eclipse.ant.ui.launching.IAntLaunchConfigurationConstants;
+import org.eclipse.ant.launching.IAntLaunchConstants;
import org.eclipse.core.commands.*;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.CoreException;
@@ -167,7 +167,7 @@ public abstract class BaseBuildAction extends AbstractHandler {
return;
Map<String, String> properties = new HashMap<String, String>();
- properties = launchCopy.getAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_PROPERTIES, properties);
+ properties = launchCopy.getAttribute(IAntLaunchConstants.ATTR_ANT_PROPERTIES, properties);
properties.put(IXMLConstants.PROPERTY_BASE_WS, TargetPlatform.getWS());
properties.put(IXMLConstants.PROPERTY_BASE_OS, TargetPlatform.getOS());
properties.put(IXMLConstants.PROPERTY_BASE_ARCH, TargetPlatform.getOSArch());
@@ -190,12 +190,10 @@ public abstract class BaseBuildAction extends AbstractHandler {
}
properties.put(IXMLConstants.PROPERTY_BOOTCLASSPATH, BuildUtilities.getBootClasspath());
- launchCopy.setAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_PROPERTIES, properties);
- launchCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME, (String) null);
- launchCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, (String) null);
+ launchCopy.setAttribute(IAntLaunchConstants.ATTR_ANT_PROPERTIES, properties);
launchCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, (String) null);
launchCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String) null);
- launchCopy.setAttribute(IAntLaunchConfigurationConstants.ATTR_DEFAULT_VM_INSTALL, (String) null);
+ launchCopy.setAttribute(IAntLaunchConstants.ATTR_DEFAULT_VM_INSTALL, (String) null);
launchCopy.doSave();
} catch (CoreException e) {
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/ImportActionGroup.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/ImportActionGroup.java
index 4c74370..6a25f6c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/ImportActionGroup.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/ImportActionGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
+ * Copyright (c) 2005, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.pde.internal.ui.views.plugins;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-
import java.util.*;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IPackageFragmentRoot;
@@ -35,6 +33,7 @@ import org.eclipse.team.core.importing.provisional.IBundleImporter;
import org.eclipse.ui.actions.ActionContext;
import org.eclipse.ui.actions.ActionGroup;
+@SuppressWarnings("restriction")
public class ImportActionGroup extends ActionGroup {
class ImportAction extends Action {
@@ -60,11 +59,13 @@ public class ImportActionGroup extends ActionGroup {
}
}
+ @Override
public void run() {
handleImport(fImportType, fSel);
}
}
+ @Override
public void fillContextMenu(IMenuManager menu) {
ActionContext context = getContext();
ISelection selection = context.getSelection();
@@ -114,10 +115,10 @@ public class ImportActionGroup extends ActionGroup {
* @param models candidate models
* @return map of importer to import descriptions
*/
- private static Map<?, ?> getImportDescriptions(Shell shell, IPluginModelBase[] models) {
+ private static Map<IBundleImporter, ScmUrlImportDescription[]> getImportDescriptions(Shell shell, IPluginModelBase[] models) {
BundleProjectService service = (BundleProjectService) BundleProjectService.getDefault();
try {
- Map<?, ?> descriptions = service.getImportDescriptions(models); // all possible descriptions
+ Map<IBundleImporter, ScmUrlImportDescription[]> descriptions = service.getImportDescriptions(models); // all possible descriptions
if (!descriptions.isEmpty()) {
return descriptions;
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java
index ab310c4..9df4e51 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2012 IBM Corporation and others.
+ * Copyright (c) 2003, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -47,6 +47,7 @@ import org.osgi.framework.Version;
/**
* The first page of the import plug-ins wizard
*/
+@SuppressWarnings("restriction")
public class PluginImportWizardFirstPage extends WizardPage {
private static final String SETTINGS_IMPORTTYPE = "importType"; //$NON-NLS-1$
@@ -274,6 +275,7 @@ public class PluginImportWizardFirstPage extends WizardPage {
importActiveTargetButton = SWTFactory.createRadioButton(composite, PDEUIMessages.ImportWizard_FirstPage_target, 1);
importActiveTargetButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
updateSourceGroup(getImportOrigin());
validateDropLocation();
@@ -285,6 +287,7 @@ public class PluginImportWizardFirstPage extends WizardPage {
openTargetPrefsLink.setText(PDEUIMessages.ImportWizard_FirstPage_goToTarget);
openTargetPrefsLink.setLayoutData(new GridData(SWT.END, SWT.BEGINNING, true, false));
openTargetPrefsLink.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
ITargetDefinition selected = getTargetDefinition();
ITargetHandle handle = null;
@@ -318,6 +321,7 @@ public class PluginImportWizardFirstPage extends WizardPage {
importTargetDefinitionButton = SWTFactory.createRadioButton(composite, PDEUIMessages.PluginImportWizardFirstPage_0, 1);
importTargetDefinitionButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
updateSourceGroup(getImportOrigin());
validateDropLocation();
@@ -325,6 +329,7 @@ public class PluginImportWizardFirstPage extends WizardPage {
});
targetDefinitionCombo = SWTFactory.createCombo(composite, SWT.DROP_DOWN | SWT.READ_ONLY, 2, GridData.FILL_HORIZONTAL, null);
targetDefinitionCombo.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
validateDropLocation();
}
@@ -332,6 +337,7 @@ public class PluginImportWizardFirstPage extends WizardPage {
importDirectoryButton = SWTFactory.createRadioButton(composite, PDEUIMessages.ImportWizard_FirstPage_otherFolder, 1);
importDirectoryButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
updateSourceGroup(getImportOrigin());
validateDropLocation();
@@ -347,6 +353,7 @@ public class PluginImportWizardFirstPage extends WizardPage {
browseButton = SWTFactory.createPushButton(composite, PDEUIMessages.ImportWizard_FirstPage_browse, null, GridData.HORIZONTAL_ALIGN_FILL);
browseButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
IPath chosen = chooseDropLocation();
if (chosen != null)
@@ -478,6 +485,7 @@ public class PluginImportWizardFirstPage extends WizardPage {
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.DialogPage#dispose()
*/
+ @Override
public void dispose() {
PDEPlugin.getDefault().getLabelProvider().disconnect(this);
}
@@ -826,6 +834,7 @@ public class PluginImportWizardFirstPage extends WizardPage {
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.WizardPage#isCurrentPage()
*/
+ @Override
public boolean isCurrentPage() {
return super.isCurrentPage();
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationOperation.java
index b57a0d7..647cdc1 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationOperation.java
@@ -44,6 +44,7 @@ public class NewSiteProjectCreationOperation extends WorkspaceModifyOperation {
/* (non-Javadoc)
* @see org.eclipse.ui.actions.WorkspaceModifyOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
int numUnits = fWebLocation == null ? 3 : 4;
@@ -72,7 +73,7 @@ public class NewSiteProjectCreationOperation extends WorkspaceModifyOperation {
}
/**
- * @return
+ * @return location of the created site.xml
* @throws CoreException
*/
private IFile createSiteManifest() throws CoreException {