Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--apitools/org.eclipse.pde.api.tools/.settings/org.eclipse.jdt.core.prefs13
-rw-r--r--apitools/org.eclipse.pde.api.tools/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--ui/org.eclipse.pde.core/.settings/org.eclipse.jdt.core.prefs1
-rw-r--r--ui/org.eclipse.pde.core/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/xml/ParserWrapperTestCase.java10
-rw-r--r--ui/org.eclipse.pde.ui/.settings/org.eclipse.jdt.core.prefs1
-rw-r--r--ui/org.eclipse.pde.ui/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestStructureCreator.java8
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizardPage.java10
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java14
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizardPage.java8
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsOperation.java10
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsOperation.java12
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/BundleManifestChange.java12
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PDEMoveParticipant.java14
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PDEModelUtility.java11
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationOperation.java6
-rw-r--r--ui/org.eclipse.ui.trace/.settings/org.eclipse.jdt.core.prefs1
-rw-r--r--ui/org.eclipse.ui.trace/.settings/org.eclipse.jdt.launching.prefs3
23 files changed, 123 insertions, 40 deletions
diff --git a/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.core.prefs
index 23ce2a1a74..eb4016a744 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Mon Feb 28 09:07:37 CST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -8,6 +7,7 @@ org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
diff --git a/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.launching.prefs b/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.launching.prefs
index f4fe2234e4..d211d32633 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.launching.prefs
+++ b/apitools/org.eclipse.pde.api.tools.tests/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,2 @@
-#Wed Feb 02 10:04:27 CST 2011
eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning
diff --git a/apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.core.prefs
index a2dfafffe8..dbd9096b34 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,13 @@
eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
@@ -7,6 +16,7 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -95,3 +105,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.launching.prefs b/apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.launching.prefs
index 9efd017e02..d211d32633 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.launching.prefs
+++ b/apitools/org.eclipse.pde.api.tools.ui/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,2 @@
-#Wed Feb 02 16:44:07 CET 2011
eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning
diff --git a/apitools/org.eclipse.pde.api.tools/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools/.settings/org.eclipse.jdt.core.prefs
index 830fbe42a2..b05bda293e 100644
--- a/apitools/org.eclipse.pde.api.tools/.settings/org.eclipse.jdt.core.prefs
+++ b/apitools/org.eclipse.pde.api.tools/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,13 @@
eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
@@ -7,6 +16,7 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.doc.comment.support=disabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -40,7 +50,6 @@ org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=warning
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disable
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
@@ -98,3 +107,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/apitools/org.eclipse.pde.api.tools/.settings/org.eclipse.jdt.launching.prefs b/apitools/org.eclipse.pde.api.tools/.settings/org.eclipse.jdt.launching.prefs
index 9efd017e02..d211d32633 100644
--- a/apitools/org.eclipse.pde.api.tools/.settings/org.eclipse.jdt.launching.prefs
+++ b/apitools/org.eclipse.pde.api.tools/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,2 @@
-#Wed Feb 02 16:44:07 CET 2011
eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning
diff --git a/ui/org.eclipse.pde.core/.settings/org.eclipse.jdt.core.prefs b/ui/org.eclipse.pde.core/.settings/org.eclipse.jdt.core.prefs
index 856f1419a6..7eed01c8b6 100644
--- a/ui/org.eclipse.pde.core/.settings/org.eclipse.jdt.core.prefs
+++ b/ui/org.eclipse.pde.core/.settings/org.eclipse.jdt.core.prefs
@@ -7,6 +7,7 @@ org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
diff --git a/ui/org.eclipse.pde.core/.settings/org.eclipse.jdt.launching.prefs b/ui/org.eclipse.pde.core/.settings/org.eclipse.jdt.launching.prefs
index 9efd017e02..d211d32633 100644
--- a/ui/org.eclipse.pde.core/.settings/org.eclipse.jdt.launching.prefs
+++ b/ui/org.eclipse.pde.core/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,2 @@
-#Wed Feb 02 16:44:07 CET 2011
eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning
diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/xml/ParserWrapperTestCase.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/xml/ParserWrapperTestCase.java
index 1379a61ad3..efe93bc210 100644
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/xml/ParserWrapperTestCase.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/xml/ParserWrapperTestCase.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 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
@@ -89,14 +89,14 @@ public class ParserWrapperTestCase extends TestCase {
public class ParserThread extends Thread {
protected final int FITERATIONS = 100;
- protected File fXMLFile;
+ protected File fParserXMLFile;
protected boolean fError;
protected int fParserType;
public ParserThread(int parserType, File file) {
fError = false;
fParserType = parserType;
- fXMLFile = file;
+ fParserXMLFile = file;
}
public void run() {
@@ -116,7 +116,7 @@ public class ParserWrapperTestCase extends TestCase {
try {
XMLDefaultHandler handler = new XMLDefaultHandler();
SAXParserWrapper parser = new SAXParserWrapper();
- parser.parse(fXMLFile, handler);
+ parser.parse(fParserXMLFile, handler);
parser.dispose();
} catch (ParserConfigurationException e) {
e.printStackTrace();
@@ -146,7 +146,7 @@ public class ParserWrapperTestCase extends TestCase {
try {
DOMParserWrapper parser = new DOMParserWrapper();
- parser.parse(fXMLFile);
+ parser.parse(fParserXMLFile);
parser.dispose();
} catch (ParserConfigurationException e) {
e.printStackTrace();
diff --git a/ui/org.eclipse.pde.ui/.settings/org.eclipse.jdt.core.prefs b/ui/org.eclipse.pde.ui/.settings/org.eclipse.jdt.core.prefs
index ed253b0dad..395ac8b33f 100644
--- a/ui/org.eclipse.pde.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/ui/org.eclipse.pde.ui/.settings/org.eclipse.jdt.core.prefs
@@ -7,6 +7,7 @@ org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
diff --git a/ui/org.eclipse.pde.ui/.settings/org.eclipse.jdt.launching.prefs b/ui/org.eclipse.pde.ui/.settings/org.eclipse.jdt.launching.prefs
index 83e5a8a741..d211d32633 100644
--- a/ui/org.eclipse.pde.ui/.settings/org.eclipse.jdt.launching.prefs
+++ b/ui/org.eclipse.pde.ui/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,2 @@
-#Wed Feb 02 16:42:20 CET 2011
eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestStructureCreator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestStructureCreator.java
index e8257bd0bf..ef1656bf59 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestStructureCreator.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestStructureCreator.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
@@ -65,6 +65,12 @@ public class ManifestStructureCreator extends StructureCreator {
return null;
}
+ /**
+ * @param root
+ * @param doc
+ * @param monitor
+ * @throws IOException
+ */
private void parseManifest(DocumentRangeNode root, IDocument doc, IProgressMonitor monitor) throws IOException {
int lineStart = 0;
int[] args = new int[2];
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizardPage.java
index cf39fe82ec..920b91ac5a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizardPage.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
@@ -198,6 +198,14 @@ public class SynchronizeVersionsWizardPage extends WizardPage {
return mode;
}
+ /**
+ * @param mode
+ * @param featureVersion
+ * @param ref
+ * @param monitor
+ * @throws CoreException
+ * @throws BadLocationException
+ */
private void synchronizeVersion(int mode, String featureVersion, IFeaturePlugin ref, IProgressMonitor monitor) throws CoreException, BadLocationException {
String id = ref.getId();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java
index e25db2654c..70177b5d59 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java
@@ -38,7 +38,7 @@ public class JavaAttributeWizardPage extends NewClassWizardPage {
String superClassName;
IType interfaceType;
String interfaceName;
- String className;
+ String initialClassName;
String classArgs;
String packageName;
IPackageFragmentRoot packageFragmentRoot;
@@ -49,7 +49,7 @@ public class JavaAttributeWizardPage extends NewClassWizardPage {
this.superClassName = ""; //$NON-NLS-1$
this.interfaceName = null;
this.interfaceType = null;
- this.className = null;
+ this.initialClassName = null;
this.classArgs = null;
this.packageName = null;
this.packageFragment = null;
@@ -72,7 +72,7 @@ public class JavaAttributeWizardPage extends NewClassWizardPage {
PDEPlugin.logException(e);
}
initialValues = new InitialClassProperties();
- initialValues.className = className;
+ initialValues.initialClassName = className;
}
public Object getValue() {
@@ -89,7 +89,7 @@ public class JavaAttributeWizardPage extends NewClassWizardPage {
setPackageFragment(initialValues.packageFragment, true);
setEnclosingType(null, true);
setEnclosingTypeSelection(false, true);
- setTypeName(initialValues.className, true);
+ setTypeName(initialValues.initialClassName, true);
setSuperClass(initialValues.superClassName, true);
if (initialValues.interfaceName != null) {
ArrayList<String> interfaces = new ArrayList<String>();
@@ -128,15 +128,15 @@ public class JavaAttributeWizardPage extends NewClassWizardPage {
className = className.substring(0, loc);
}
if (loc > 0)
- initialValues.className = className.substring(0, loc);
+ initialValues.initialClassName = className.substring(0, loc);
else if (loc == 0)
- initialValues.className = ""; //$NON-NLS-1$
+ initialValues.initialClassName = ""; //$NON-NLS-1$
}
loc = className.lastIndexOf('.');
if (loc != -1) {
initialValues.packageName = className.substring(0, loc);
- initialValues.className = className.substring(loc + 1);
+ initialValues.initialClassName = className.substring(loc + 1);
}
if (javaProject == null)
return;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizardPage.java
index 967cb408f8..d689fe9332 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizardPage.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
@@ -192,6 +192,12 @@ public class SynchronizePropertiesWizardPage extends WizardPage {
}
}
+ /**
+ * @param mode
+ * @param monitor
+ * @throws CoreException
+ * @throws InvocationTargetException
+ */
private void runOperation(int mode, IProgressMonitor monitor) throws CoreException, InvocationTargetException {
ISiteFeature[] siteFeatures;
if (mode == SELECTED_FEATURES) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsOperation.java
index ae6aae9a43..cfd8363827 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsOperation.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
@@ -143,6 +143,14 @@ public class ExternalizeStringsOperation extends WorkspaceModifyOperation {
return change;
}
+ /**
+ * @param changeFile
+ * @param pDoc
+ * @param pChange
+ * @param monitor
+ * @param parentChange
+ * @throws CoreException
+ */
private void doReplace(ModelChangeFile changeFile, IDocument pDoc, TextFileChange pChange, IProgressMonitor monitor, CompositeChange parentChange) throws CoreException {
IFile uFile = changeFile.getFile();
try {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsOperation.java
index ea2bc3559f..40c66210b3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsOperation.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
@@ -115,6 +115,11 @@ public class GetNonExternalizedStringsOperation implements IRunnableWithProgress
monitor.done();
}
+ /**
+ * @param model
+ * @param monitor
+ * @throws CoreException
+ */
private void inspectManifest(IBundlePluginModelBase model, IProgressMonitor monitor) throws CoreException {
IFile manifestFile = (IFile) model.getBundleModel().getUnderlyingResource();
IBundle bundle = model.getBundleModel().getBundle();
@@ -125,6 +130,11 @@ public class GetNonExternalizedStringsOperation implements IRunnableWithProgress
}
}
+ /**
+ * @param model
+ * @param monitor
+ * @throws CoreException
+ */
private void inspectXML(IPluginModelBase model, IProgressMonitor monitor) throws CoreException {
IFile file;
if (model instanceof IBundlePluginModelBase) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/BundleManifestChange.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/BundleManifestChange.java
index 3ae698b339..3cd7cf8e8b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/BundleManifestChange.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/BundleManifestChange.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
@@ -11,8 +11,6 @@
*******************************************************************************/
package org.eclipse.pde.internal.ui.refactoring;
-import org.eclipse.pde.internal.core.text.bundle.PDEManifestElement;
-
import java.util.ArrayList;
import org.eclipse.core.filebuffers.*;
import org.eclipse.core.resources.IFile;
@@ -222,6 +220,14 @@ public class BundleManifestChange {
return (manifestVersion < 2) ? ICoreConstants.PROVIDE_PACKAGE : Constants.EXPORT_PACKAGE;
}
+ /**
+ * @param file
+ * @param monitor
+ * @return the bundle for the given {@link IFile}
+ * @throws CoreException
+ * @throws MalformedTreeException
+ * @throws BadLocationException
+ */
public static Bundle getBundle(IFile file, IProgressMonitor monitor) throws CoreException, MalformedTreeException, BadLocationException {
ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
manager.connect(file.getFullPath(), LocationKind.NORMALIZE, monitor);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PDEMoveParticipant.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PDEMoveParticipant.java
index e1114d29e2..b0f7b8a536 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PDEMoveParticipant.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PDEMoveParticipant.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
@@ -45,10 +45,20 @@ public abstract class PDEMoveParticipant extends MoveParticipant implements ISha
protected abstract boolean isInterestingForExtensions();
+ /**
+ * @param result
+ * @param file
+ * @param pm
+ * @throws CoreException
+ */
protected void addChange(CompositeChange result, IFile file, IProgressMonitor pm) throws CoreException {
}
- // add main change (whether to Manifest or build.properties)
+ /**
+ * @param result
+ * @param pm
+ * @throws CoreException
+ */
protected void addChange(CompositeChange result, IProgressMonitor pm) throws CoreException {
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PDEModelUtility.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PDEModelUtility.java
index c06a68bf83..a0557777b2 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PDEModelUtility.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PDEModelUtility.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.util;
-import java.util.ArrayList;
-
import java.util.*;
import org.eclipse.core.filebuffers.*;
import org.eclipse.core.resources.IFile;
@@ -495,6 +493,13 @@ public class PDEModelUtility {
return model;
}
+ /**
+ * @param files
+ * @param docs
+ * @param generateEditNames
+ * @return the {@link IBaseModel} for the new model
+ * @throws CoreException
+ */
private static IBaseModel prepareBundlePluginModel(IFile[] files, IDocument[] docs, boolean generateEditNames) throws CoreException {
AbstractEditingModel[] models = new AbstractEditingModel[docs.length];
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 a77ff7c224..b57a0d7ac3 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
@@ -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
@@ -71,6 +71,10 @@ public class NewSiteProjectCreationOperation extends WorkspaceModifyOperation {
}
+ /**
+ * @return
+ * @throws CoreException
+ */
private IFile createSiteManifest() throws CoreException {
IFile file = fProject.getFile("site.xml"); //$NON-NLS-1$
if (file.exists())
diff --git a/ui/org.eclipse.ui.trace/.settings/org.eclipse.jdt.core.prefs b/ui/org.eclipse.ui.trace/.settings/org.eclipse.jdt.core.prefs
index 239445b313..d5326a4140 100644
--- a/ui/org.eclipse.ui.trace/.settings/org.eclipse.jdt.core.prefs
+++ b/ui/org.eclipse.ui.trace/.settings/org.eclipse.jdt.core.prefs
@@ -7,6 +7,7 @@ org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled
diff --git a/ui/org.eclipse.ui.trace/.settings/org.eclipse.jdt.launching.prefs b/ui/org.eclipse.ui.trace/.settings/org.eclipse.jdt.launching.prefs
index 83e5a8a741..d211d32633 100644
--- a/ui/org.eclipse.ui.trace/.settings/org.eclipse.jdt.launching.prefs
+++ b/ui/org.eclipse.ui.trace/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,2 @@
-#Wed Feb 02 16:42:20 CET 2011
eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=error
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning

Back to the top