diff options
author | Stefan Xenos | 2016-03-22 17:33:14 +0000 |
---|---|---|
committer | Stefan Xenos | 2016-03-22 21:52:18 +0000 |
commit | bd0ead98b29653875145033cf77d61e14c636b02 (patch) | |
tree | c5bf10618a50078c31229d396f53185268ca1ecf /bundles | |
parent | b8821710ffb03f8e7573be209e1ab14e27ba04b4 (diff) | |
download | eclipse.platform.team-bd0ead98b29653875145033cf77d61e14c636b02.tar.gz eclipse.platform.team-bd0ead98b29653875145033cf77d61e14c636b02.tar.xz eclipse.platform.team-bd0ead98b29653875145033cf77d61e14c636b02.zip |
Bug 489805 - Move the team git repository to Java 1.8
Fixes compiler warnings.
This reverts commit b8821710ffb03f8e7573be209e1ab14e27ba04b4.
Change-Id: I64b54428dc8500ab05427d505bb801e46511916b
Signed-off-by: Stefan Xenos <sxenos@gmail.com>
Diffstat (limited to 'bundles')
76 files changed, 182 insertions, 228 deletions
diff --git a/bundles/org.eclipse.compare.core/.classpath b/bundles/org.eclipse.compare.core/.classpath index 2fbb7a23e..eca7bdba8 100644 --- a/bundles/org.eclipse.compare.core/.classpath +++ b/bundles/org.eclipse.compare.core/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.compare.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.compare.core/.settings/org.eclipse.jdt.core.prefs index 91027d7c7..54606d707 100644 --- a/bundles/org.eclipse.compare.core/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.compare.core/.settings/org.eclipse.jdt.core.prefs @@ -7,12 +7,13 @@ 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.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled @@ -25,6 +26,6 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF index 7a177bfe0..7ccad3ec0 100644 --- a/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.compare.core -Bundle-Version: 3.5.500.qualifier +Bundle-Version: 3.6.0.qualifier Bundle-Activator: org.eclipse.compare.internal.core.ComparePlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)" -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.compare.internal.core;x-friends:="org.eclipse.compare", org.eclipse.compare.internal.core.patch;x-friends:="org.eclipse.compare", diff --git a/bundles/org.eclipse.compare.core/pom.xml b/bundles/org.eclipse.compare.core/pom.xml index be012aa9d..c8bd087d6 100644 --- a/bundles/org.eclipse.compare.core/pom.xml +++ b/bundles/org.eclipse.compare.core/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.compare</groupId> <artifactId>org.eclipse.compare.core</artifactId> - <version>3.5.500-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.compare.win32/.classpath b/bundles/org.eclipse.compare.win32/.classpath index 2fbb7a23e..eca7bdba8 100644 --- a/bundles/org.eclipse.compare.win32/.classpath +++ b/bundles/org.eclipse.compare.win32/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.compare.win32/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.compare.win32/.settings/org.eclipse.jdt.core.prefs index 185de0ba6..a0a77ac26 100644 --- a/bundles/org.eclipse.compare.win32/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.compare.win32/.settings/org.eclipse.jdt.core.prefs @@ -8,15 +8,15 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.compliance=1.8 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.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF index 9e6ffa1ed..bdac3923a 100644 --- a/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.compare.win32;singleton:=true -Bundle-Version: 1.0.200.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Eclipse-PlatformFilter: (osgi.os=win32) Require-Bundle: org.eclipse.compare;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)", diff --git a/bundles/org.eclipse.compare.win32/pom.xml b/bundles/org.eclipse.compare.win32/pom.xml index 0eb49d12b..155053c14 100644 --- a/bundles/org.eclipse.compare.win32/pom.xml +++ b/bundles/org.eclipse.compare.win32/pom.xml @@ -19,7 +19,7 @@ </parent> <groupId>org.eclipse.compare</groupId> <artifactId>org.eclipse.compare.win32</artifactId> - <version>1.0.200-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/bundles/org.eclipse.compare/.classpath b/bundles/org.eclipse.compare/.classpath index d6b5509a8..013075d7e 100644 --- a/bundles/org.eclipse.compare/.classpath +++ b/bundles/org.eclipse.compare/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="compare/"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="src" path="compare"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.compare/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.compare/.settings/org.eclipse.jdt.core.prefs index ae8b25168..06f23f327 100644 --- a/bundles/org.eclipse.compare/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.compare/.settings/org.eclipse.jdt.core.prefs @@ -7,21 +7,22 @@ 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.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.compliance=1.8
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.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
@@ -67,7 +68,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,NORMAL,NORMAL
org.eclipse.jdt.core.compiler.taskTags=TODO,XXX,FIXME
diff --git a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF index 9f19c09eb..823e37d40 100644 --- a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.compare; singleton:=true -Bundle-Version: 3.5.700.qualifier +Bundle-Version: 3.6.0.qualifier Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -27,4 +27,4 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", Bundle-ActivationPolicy: lazy Import-Package: com.ibm.icu.util, com.ibm.icu.text -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java index 12590240c..ff983b0db 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java @@ -319,7 +319,7 @@ public abstract class CompareViewerSwitchingPane extends CompareViewerPane { if (fTitle != null) { if (fTitleArgument != null) { String format= CompareMessages.CompareViewerSwitchingPane_Titleformat; - String t= MessageFormat.format(format, new String[] { fTitle, fTitleArgument } ); + String t= MessageFormat.format(format, fTitle, fTitleArgument); setText(t); } else setText(fTitle); diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java index 95b4f30c9..a2f805d4c 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java @@ -630,7 +630,7 @@ public class EditionSelectionDialog extends ResizableDialog { private String formatString(String string, String variable) { // Only process the string if it contains a variable or an escaped quote (see bug 190023) if (hasVariable(string) || hasDoubleQuotes(string)) - return MessageFormat.format(string, new Object[] { variable }); + return MessageFormat.format(string, variable); return string; } @@ -833,7 +833,7 @@ public class EditionSelectionDialog extends ResizableDialog { if (fTitleArg == null) fTitleArg= fTargetPair.getItem().getName(); String titleFormat= Utilities.getString(fBundle, "treeTitleFormat"); //$NON-NLS-1$ - String title= MessageFormat.format(titleFormat, new String[] { fTitleArg }); + String title= MessageFormat.format(titleFormat, fTitleArg ); fEditionPane.setText(title); if (fTitleImage != null) fEditionPane.setImage(fTitleImage); @@ -1062,7 +1062,7 @@ public class EditionSelectionDialog extends ResizableDialog { formatKey= "dayFormat"; //$NON-NLS-1$ String pattern= Utilities.getString(fBundle, formatKey); if (pattern != null) - df= MessageFormat.format(pattern, new String[] { df }); + df= MessageFormat.format(pattern, df); lastDay.setText(df); lastDay.setData(date); } @@ -1072,7 +1072,7 @@ public class EditionSelectionDialog extends ResizableDialog { String s= getShortEditionLabel(edition, item, date); if (pair.fHasError) { String pattern= Utilities.getString(fBundle, "parseErrorFormat"); //$NON-NLS-1$ - s= MessageFormat.format(pattern, new String[] { s } ); + s= MessageFormat.format(pattern, s); } ti.setText(s); diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index c10b0854e..dffed0627 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -2162,7 +2162,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { IWorkbenchPart workbenchPart = getCompareConfiguration().getContainer().getWorkbenchPart(); if (workbenchPart != null) { - IContextService service = (IContextService)workbenchPart.getSite().getService(IContextService.class); + IContextService service = workbenchPart.getSite().getService(IContextService.class); if (service != null) { service.activateContext("org.eclipse.ui.textEditorScope"); //$NON-NLS-1$ } @@ -3649,22 +3649,18 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { String format= CompareMessages.TextMergeViewer_diffDescription_diff_format; diffDescription= MessageFormat.format(format, - new String[] { - getDiffType(diff), // 0: diff type - getDiffNumber(diff), // 1: diff number - getDiffRange(fLeft, diff.getPosition(LEFT_CONTRIBUTOR)), // 2: left start line - getDiffRange(fRight, diff.getPosition(RIGHT_CONTRIBUTOR)) // 3: left end line - } + getDiffType(diff), // 0: diff type + getDiffNumber(diff), // 1: diff number + getDiffRange(fLeft, diff.getPosition(LEFT_CONTRIBUTOR)), // 2: left start line + getDiffRange(fRight, diff.getPosition(RIGHT_CONTRIBUTOR)) // 3: left end line ); } String format= CompareMessages.TextMergeViewer_statusLine_format; String s= MessageFormat.format(format, - new String[] { - getCursorPosition(fLeft), // 0: left column - getCursorPosition(fRight), // 1: right column - diffDescription // 2: diff description - } + getCursorPosition(fLeft), // 0: left column + getCursorPosition(fRight), // 1: right column + diffDescription // 2: diff description ); getCompareConfiguration().getContainer().setStatusMessage(s); @@ -3684,7 +3680,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { break; } String format= CompareMessages.TextMergeViewer_diffType_format; - return MessageFormat.format(format, new String[] { s, diff.changeType() } ); + return MessageFormat.format(format, s, diff.changeType()); } private String getDiffNumber(Diff diff) { @@ -3711,9 +3707,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { format= CompareMessages.TextMergeViewer_beforeLine_format; else format= CompareMessages.TextMergeViewer_range_format; - return MessageFormat.format(format, - new String[] { Integer.toString(startLine), - Integer.toString(endLine) } ); + return MessageFormat.format(format, Integer.toString(startLine), Integer.toString(endLine)); } /* @@ -3745,7 +3739,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { String format= CompareMessages.TextMergeViewer_cursorPosition_format; return MessageFormat.format(format, - new String[] { Integer.toString(line + 1), Integer.toString(column + 1) } ); + Integer.toString(line + 1), Integer.toString(column + 1) ); } catch (BadLocationException x) { // silently ignored diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java index 17e1501af..23231bb83 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java @@ -152,7 +152,7 @@ public class AddFromHistoryDialog extends ResizableDialog { create(); // create widgets String format= Utilities.getString(fBundle, "memberPaneTitle"); //$NON-NLS-1$ - String title= MessageFormat.format(format, new Object[] { root.getName() }); + String title= MessageFormat.format(format, root.getName()); fMemberPane.setImage(CompareUI.getImage(root)); fMemberPane.setText(title); @@ -313,7 +313,7 @@ public class AddFromHistoryDialog extends ResizableDialog { fEditionPane.setImage(CompareUI.getImage(file)); String pattern= Utilities.getString(fBundle, "treeTitleFormat"); //$NON-NLS-1$ - String title= MessageFormat.format(pattern, new Object[] { file.getName() }); + String title= MessageFormat.format(pattern, file.getName()); fEditionPane.setText(title); if (fEditionTree != null) { @@ -362,7 +362,7 @@ public class AddFromHistoryDialog extends ResizableDialog { formatKey= "dayFormat"; //$NON-NLS-1$ String pattern= Utilities.getString(fBundle, formatKey); if (pattern != null) - df= MessageFormat.format(pattern, new String[] { df }); + df= MessageFormat.format(pattern, df); lastDay.setText(df); lastDay.setData(date); } @@ -421,7 +421,7 @@ public class AddFromHistoryDialog extends ResizableDialog { long modDate= input.getModificationDate(); String date= DateFormat.getDateTimeInstance().format(new Date(modDate)); - return MessageFormat.format(format, new Object[] { date }); + return MessageFormat.format(format, date); } /* (non-Javadoc) diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java index d9bb9563d..57fe155d1 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java @@ -92,7 +92,7 @@ public class BinaryCompareViewer extends AbstractViewer { int r= right.read(); if (l != r) { String format= Utilities.getString(fBundle, "diffMessageFormat"); //$NON-NLS-1$ - message= MessageFormat.format(format, new String[] { Integer.toString(pos) } ); + message= MessageFormat.format(format, Integer.toString(pos) ); break; } if (l == EOF) diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java index 2a18594ed..efbe3f056 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java @@ -319,7 +319,7 @@ public class CompareEditor extends EditorPart implements IReusableEditor, ISavea } private void registerSaveable() { - ISaveablesLifecycleListener lifecycleListener= (ISaveablesLifecycleListener) getSite().getService(ISaveablesLifecycleListener.class); + ISaveablesLifecycleListener lifecycleListener= getSite().getService(ISaveablesLifecycleListener.class); lifecycleListener.handleLifecycleEvent( new SaveablesLifecycleEvent(this, SaveablesLifecycleEvent.POST_OPEN, internalGetSaveables(true), false)); } @@ -332,7 +332,7 @@ public class CompareEditor extends EditorPart implements IReusableEditor, ISavea // Let the workbench know that the old input's saveables are no longer needed if (knownSaveables != null && !knownSaveables.isEmpty()) { - ISaveablesLifecycleListener lifecycleListener= (ISaveablesLifecycleListener) getSite().getService(ISaveablesLifecycleListener.class); + ISaveablesLifecycleListener lifecycleListener= getSite().getService(ISaveablesLifecycleListener.class); lifecycleListener.handleLifecycleEvent( new SaveablesLifecycleEvent(this, SaveablesLifecycleEvent.POST_CLOSE, (Saveable[]) knownSaveables.toArray(new Saveable[knownSaveables.size()]), false)); knownSaveables.clear(); @@ -412,7 +412,7 @@ public class CompareEditor extends EditorPart implements IReusableEditor, ISavea parent.setData(this); fPageBook = new PageBook(parent, SWT.NONE); createCompareControl(); - IContextService service = (IContextService)getSite().getService(IContextService.class); + IContextService service = getSite().getService(IContextService.class); if (service != null) { service.activateContext("org.eclipse.compare.compareEditorScope"); //$NON-NLS-1$ service.activateContext("org.eclipse.ui.textEditorScope"); //$NON-NLS-1$ @@ -741,7 +741,7 @@ public class CompareEditor extends EditorPart implements IReusableEditor, ISavea } public void handleLifecycleEvent(SaveablesLifecycleEvent event) { - ISaveablesLifecycleListener lifecycleListener= (ISaveablesLifecycleListener) getSite().getService(ISaveablesLifecycleListener.class); + ISaveablesLifecycleListener lifecycleListener= getSite().getService(ISaveablesLifecycleListener.class); if (event.getEventType() == SaveablesLifecycleEvent.POST_CLOSE) { // We may get a post close for a saveable that is not known to the workbench. // Only pass on the event for known saveables diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareHandlerService.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareHandlerService.java index 0037c2db5..a3b4d4fcc 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareHandlerService.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareHandlerService.java @@ -35,13 +35,13 @@ public class CompareHandlerService { public static CompareHandlerService createFor(ICompareContainer container, Shell shell) { IServiceLocator serviceLocator = container.getServiceLocator(); if (serviceLocator != null) { - IHandlerService service = (IHandlerService)serviceLocator.getService(IHandlerService.class); + IHandlerService service = serviceLocator.getService(IHandlerService.class); if (service != null) return new CompareHandlerService(container, null); } if (container.getWorkbenchPart() == null && shell != null) { // We're in a dialog so we can use an active shell expression - IHandlerService service = (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class); + IHandlerService service = PlatformUI.getWorkbench().getService(IHandlerService.class); if (service != null) { Expression e = new ActiveShellExpression(shell); return new CompareHandlerService(container, e); @@ -83,13 +83,13 @@ public class CompareHandlerService { if (fHandlerService == null) { IServiceLocator serviceLocator = fContainer.getServiceLocator(); if (serviceLocator != null) { - IHandlerService service = (IHandlerService)serviceLocator.getService(IHandlerService.class); + IHandlerService service = serviceLocator.getService(IHandlerService.class); if (service != null) fHandlerService = service; } if (fHandlerService == null && fContainer.getWorkbenchPart() == null && fExpression != null) { // We're in a dialog so we can use an active shell expression - IHandlerService service = (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class); + IHandlerService service = PlatformUI.getWorkbench().getService(IHandlerService.class); if (service != null) { fHandlerService = service; } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java index 0e7090296..eb5529f5e 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareResourceFilter.java @@ -63,7 +63,7 @@ public class CompareResourceFilter { IStatus status= workspace.validateName(fileName, resourceType); if (status.matches(IStatus.ERROR)) { String format= Utilities.getString("ComparePreferencePage.filter.invalidsegment.error"); //$NON-NLS-1$ - return MessageFormat.format(format, new String[] { status.getMessage() } ); + return MessageFormat.format(format, status.getMessage()); } } return null; diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java index 59797adcf..7fe0365c6 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java @@ -839,7 +839,7 @@ public class MergeSourceViewer implements ISelectionChangedListener, } private void addSave(IMenuManager menu) { - ICommandService commandService = (ICommandService) fContainer.getWorkbenchPart().getSite().getService(ICommandService.class); + ICommandService commandService = fContainer.getWorkbenchPart().getSite().getService(ICommandService.class); final Command command= commandService.getCommand(IWorkbenchCommandConstants.FILE_SAVE); final IHandler handler = command.getHandler(); diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java index 4c01f8695..8c0807f2f 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java @@ -396,10 +396,10 @@ class ResourceCompareInput extends CompareEditorInput { if (fThreeWay) { String format= Utilities.getString("ResourceCompare.threeWay.title"); //$NON-NLS-1$ String ancestorLabel= fAncestorResource.getName(); - title= MessageFormat.format(format, new String[] {ancestorLabel, leftLabel, rightLabel}); + title= MessageFormat.format(format, ancestorLabel, leftLabel, rightLabel); } else { String format= Utilities.getString("ResourceCompare.twoWay.title"); //$NON-NLS-1$ - title= MessageFormat.format(format, new String[] {leftLabel, rightLabel}); + title= MessageFormat.format(format, leftLabel, rightLabel); } setTitle(title); @@ -426,10 +426,10 @@ class ResourceCompareInput extends CompareEditorInput { if (fThreeWay) { String format= Utilities.getString("ResourceCompare.threeWay.tooltip"); //$NON-NLS-1$ String ancestorLabel= fAncestorResource.getFullPath().makeRelative().toString(); - return MessageFormat.format(format, new String[] {ancestorLabel, leftLabel, rightLabel}); + return MessageFormat.format(format, ancestorLabel, leftLabel, rightLabel); } String format= Utilities.getString("ResourceCompare.twoWay.tooltip"); //$NON-NLS-1$ - return MessageFormat.format(format, new String[] {leftLabel, rightLabel}); + return MessageFormat.format(format, leftLabel, rightLabel); } // fall back return super.getToolTipText(); diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java index 6283b3190..5565336e5 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java @@ -374,7 +374,7 @@ public class Utilities { if (bundle != null) { try { - return MessageFormat.format(bundle.getString(key), new String[] { arg }); + return MessageFormat.format(bundle.getString(key), arg); } catch (MissingResourceException x) { CompareUIPlugin.log(x); } @@ -392,7 +392,7 @@ public class Utilities { public static String getFormattedString(String key, String arg) { try { - return MessageFormat.format(CompareUI.getResourceBundle().getString(key), new String[] { arg }); + return MessageFormat.format(CompareUI.getResourceBundle().getString(key), arg); } catch (MissingResourceException e) { return "!" + key + "!"; //$NON-NLS-2$ //$NON-NLS-1$ } @@ -400,7 +400,7 @@ public class Utilities { public static String getFormattedString(String key, String arg0, String arg1) { try { - return MessageFormat.format(CompareUI.getResourceBundle().getString(key), new String[] { arg0, arg1 }); + return MessageFormat.format(CompareUI.getResourceBundle().getString(key), arg0, arg1); } catch (MissingResourceException e) { return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$ } @@ -845,7 +845,7 @@ public class Utilities { public static void schedule(Job job, IWorkbenchSite site) { if (site != null) { - IWorkbenchSiteProgressService siteProgress = (IWorkbenchSiteProgressService) site.getAdapter(IWorkbenchSiteProgressService.class); + IWorkbenchSiteProgressService siteProgress = site.getAdapter(IWorkbenchSiteProgressService.class); if (siteProgress != null) { siteProgress.schedule(job, 0, true /* use half-busy cursor */); return; diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java index a8bbeccff..73b8d60c6 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java @@ -240,7 +240,7 @@ public class InputPatchPage extends WizardPage { IFilePatch2[] diffs= patcher.getDiffs(); if (diffs == null || diffs.length == 0) { String format= PatchMessages.InputPatchPage_NoDiffsFound_format; - String message= MessageFormat.format(format, new String[] { fPatchSource }); + String message= MessageFormat.format(format, fPatchSource); MessageDialog.openInformation(null, PatchMessages.InputPatchPage_PatchErrorDialog_title, message); return false; } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java index a7a81da55..44688f292 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java @@ -149,7 +149,7 @@ public class PatchTargetPage extends WizardPage { break; } String format = PatchMessages.InputPatchPage_SingleFileError_format; - String message = MessageFormat.format(format, new String[] {source}); + String message = MessageFormat.format(format, source); MessageDialog.openInformation(null, PatchMessages.InputPatchPage_PatchErrorDialog_title, message); return this; } diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java index 5c4891a86..b1775f0f1 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java @@ -216,7 +216,7 @@ public class DiffNode extends DiffContainer implements ICompareInput { } String fmt= Utilities.getString("DiffNode.nameFormat"); //$NON-NLS-1$ - return MessageFormat.format(fmt, new String[] { s1, s2 }); + return MessageFormat.format(fmt, s1, s2); } void swapSides(boolean swap) { diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java index 3339b3425..182790e3e 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java @@ -551,7 +551,7 @@ public class Differencer { if (node instanceof ITypedElement) { String name= ((ITypedElement)node).getName(); String fmt= Utilities.getString("Differencer.progressFormat"); //$NON-NLS-1$ - String msg= MessageFormat.format(fmt, new String[] { name }); + String msg= MessageFormat.format(fmt, name ); progressMonitor.subTask(msg); //progressMonitor.worked(1); } diff --git a/bundles/org.eclipse.compare/pom.xml b/bundles/org.eclipse.compare/pom.xml index d00d23a56..069866faf 100644 --- a/bundles/org.eclipse.compare/pom.xml +++ b/bundles/org.eclipse.compare/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.compare</groupId> <artifactId>org.eclipse.compare</artifactId> - <version>3.5.700-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.core.net/.classpath b/bundles/org.eclipse.core.net/.classpath index ce7393340..22f30643c 100644 --- a/bundles/org.eclipse.core.net/.classpath +++ b/bundles/org.eclipse.core.net/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.core.net/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.core.net/.settings/org.eclipse.jdt.core.prefs index 134739714..1922ca97f 100644 --- a/bundles/org.eclipse.core.net/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.core.net/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Tue Feb 01 14:40:09 CET 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -8,12 +7,13 @@ 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.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 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.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=error org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=error @@ -22,7 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=error org.eclipse.jdt.core.compiler.problem.emptyStatement=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=error org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -88,7 +88,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,XXX diff --git a/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF index f806e7cb2..9465ee039 100644 --- a/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %PLUGIN_NAME Bundle-SymbolicName: org.eclipse.core.net;singleton:=true -Bundle-Version: 1.2.300.qualifier +Bundle-Version: 1.3.0.qualifier Bundle-Activator: org.eclipse.core.internal.net.Activator Bundle-Vendor: %PLUGIN_PROVIDER Bundle-Localization: plugin @@ -14,5 +14,4 @@ Require-Bundle: org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)", Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.core.internal.net;x-friends:="org.eclipse.ui.net", org.eclipse.core.net.proxy -Bundle-RequiredExecutionEnvironment: J2SE-1.4, - CDC-1.1/Foundation-1.1 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/.classpath b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/.classpath index 2fbb7a23e..eca7bdba8 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/.classpath +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/META-INF/MANIFEST.MF index 264b85812..891156541 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %fragmentName Bundle-Vendor: %providerName Bundle-Localization: fragment Bundle-SymbolicName: org.eclipse.core.net.linux.x86;singleton:=true -Bundle-Version: 1.1.300.qualifier +Bundle-Version: 1.2.0.qualifier Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0" Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86)) -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/pom.xml b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/pom.xml index 18e79f1b1..860394893 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/pom.xml +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/pom.xml @@ -19,7 +19,7 @@ </parent> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.net.linux.x86</artifactId> - <version>1.1.300-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.classpath b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.classpath index 065ac06e1..01836c484 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.classpath +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/.classpath @@ -2,6 +2,6 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/META-INF/MANIFEST.MF index 8c0f1e5b9..edd1ecc8a 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %fragmentName Bundle-Vendor: %providerName Bundle-Localization: fragment Bundle-SymbolicName: org.eclipse.core.net.linux.x86_64;singleton:=true -Bundle-Version: 1.1.100.qualifier +Bundle-Version: 1.2.0.qualifier Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0" Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml index ab8ff85e8..8ad00a7a9 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml @@ -19,10 +19,9 @@ </parent> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.net.linux.x86_64</artifactId> - <version>1.1.100-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - <build> <plugins> <plugin> diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/.classpath b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/.classpath index 2fbb7a23e..eca7bdba8 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/.classpath +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/META-INF/MANIFEST.MF index 3c92687ec..6266c36de 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %fragmentName Bundle-Vendor: %providerName Bundle-Localization: fragment Bundle-SymbolicName: org.eclipse.core.net.win32.x86;singleton:=true -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.1.0.qualifier Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0" Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86)) -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/pom.xml b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/pom.xml index 9e4ffd462..9a4e976f1 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/pom.xml +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/pom.xml @@ -19,7 +19,7 @@ </parent> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.net.win32.x86</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.classpath b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.classpath index 2fbb7a23e..eca7bdba8 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.classpath +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/META-INF/MANIFEST.MF index ff103d7c4..668fc07e7 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %fragmentName Bundle-Vendor: %providerName Bundle-Localization: fragment Bundle-SymbolicName: org.eclipse.core.net.win32.x86_64;singleton:=true -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.1.0.qualifier Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0" Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86_64)) -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/pom.xml b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/pom.xml index 2a57fb5c1..8d09c9b98 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/pom.xml +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64/pom.xml @@ -19,7 +19,7 @@ </parent> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.net.win32.x86_64</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/bundles/org.eclipse.core.net/pom.xml b/bundles/org.eclipse.core.net/pom.xml index 617840cda..b6fc50b8a 100644 --- a/bundles/org.eclipse.core.net/pom.xml +++ b/bundles/org.eclipse.core.net/pom.xml @@ -19,20 +19,6 @@ </parent> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.net</artifactId> - <version>1.2.300-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <configuration> - <!-- - dependency on org.eclipse.equinox.security requires at least J2SE-1.4 - --> - <executionEnvironment>J2SE-1.4</executionEnvironment> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/bundles/org.eclipse.jsch.core/.classpath b/bundles/org.eclipse.jsch.core/.classpath index ce7393340..22f30643c 100644 --- a/bundles/org.eclipse.jsch.core/.classpath +++ b/bundles/org.eclipse.jsch.core/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.jsch.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jsch.core/META-INF/MANIFEST.MF index fec118872..a7ec78815 100644 --- a/bundles/org.eclipse.jsch.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.jsch.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jsch.core;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.3.0.qualifier Bundle-Activator: org.eclipse.jsch.internal.core.JSchCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -12,4 +12,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)", Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.jsch.core;uses:="org.eclipse.core.runtime,com.jcraft.jsch", org.eclipse.jsch.internal.core;x-friends:="org.eclipse.jsch.ui" -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.eclipse.jsch.core/pom.xml b/bundles/org.eclipse.jsch.core/pom.xml index e6bd8fa63..763134f54 100644 --- a/bundles/org.eclipse.jsch.core/pom.xml +++ b/bundles/org.eclipse.jsch.core/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.jsch</groupId> <artifactId>org.eclipse.jsch.core</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.jsch.ui/.classpath b/bundles/org.eclipse.jsch.ui/.classpath index ce7393340..22f30643c 100644 --- a/bundles/org.eclipse.jsch.ui/.classpath +++ b/bundles/org.eclipse.jsch.ui/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF index 7b980d4b5..668afac1e 100644 --- a/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jsch.ui;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.3.0.qualifier Bundle-Activator: org.eclipse.jsch.internal.ui.JSchUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", org.eclipse.jsch.core;bundle-version="[1.2.0,2.0.0)", com.jcraft.jsch;bundle-version="[0.1.50,1.0.0)" Eclipse-LazyStart: true -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.jsch.internal.ui;x-internal:=true, org.eclipse.jsch.internal.ui.authenticator;x-internal:=true, org.eclipse.jsch.internal.ui.preference;x-internal:=true, diff --git a/bundles/org.eclipse.jsch.ui/pom.xml b/bundles/org.eclipse.jsch.ui/pom.xml index c0c0fc0ac..fe82cd1cc 100644 --- a/bundles/org.eclipse.jsch.ui/pom.xml +++ b/bundles/org.eclipse.jsch.ui/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.jsch</groupId> <artifactId>org.eclipse.jsch.ui</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.team.core/.classpath b/bundles/org.eclipse.team.core/.classpath index ce7393340..22f30643c 100644 --- a/bundles/org.eclipse.team.core/.classpath +++ b/bundles/org.eclipse.team.core/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.team.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.team.core/.settings/org.eclipse.jdt.core.prefs index df7c649af..ff111e439 100644 --- a/bundles/org.eclipse.team.core/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.team.core/.settings/org.eclipse.jdt.core.prefs @@ -7,10 +7,10 @@ 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.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -43,7 +43,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.missingJavadocComments=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public @@ -79,7 +78,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF index 3c371094e..75a547af0 100644 --- a/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.team.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.team.core; singleton:=true -Bundle-Version: 3.7.100.qualifier +Bundle-Version: 3.8.0.qualifier Bundle-Activator: org.eclipse.team.internal.core.TeamPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -28,4 +28,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)", org.eclipse.compare.core;bundle-version="[3.5.200,4.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.eclipse.team.core/pom.xml b/bundles/org.eclipse.team.core/pom.xml index 4cb296e97..af81c725b 100644 --- a/bundles/org.eclipse.team.core/pom.xml +++ b/bundles/org.eclipse.team.core/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.team</groupId> <artifactId>org.eclipse.team.core</artifactId> - <version>3.7.100-SNAPSHOT</version> + <version>3.8.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/LineComparator.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/LineComparator.java index 7a557a7c1..f9e01603c 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/LineComparator.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/LineComparator.java @@ -100,21 +100,22 @@ class LineComparator implements IRangeComparator { TrailingLineFeedDetector trailingLineFeedDetector = new TrailingLineFeedDetector( is); - BufferedReader br = new BufferedReader(new InputStreamReader( - trailingLineFeedDetector, encoding)); - String line; - ArrayList ar = new ArrayList(); - while ((line = br.readLine()) != null) { - ar.add(line); - } - // Add a trailing line if the last character in the file was a line - // feed. - // We do this because a BufferedReader doesn't distinguish the case - // where the last line has or doesn't have a trailing line separator - if (trailingLineFeedDetector.hadTrailingLineFeed()) { - ar.add(""); //$NON-NLS-1$ + try (BufferedReader br = new BufferedReader(new InputStreamReader( + trailingLineFeedDetector, encoding))) { + String line; + ArrayList ar = new ArrayList(); + while ((line = br.readLine()) != null) { + ar.add(line); + } + // Add a trailing line if the last character in the file was a line + // feed. + // We do this because a BufferedReader doesn't distinguish the case + // where the last line has or doesn't have a trailing line separator + if (trailingLineFeedDetector.hadTrailingLineFeed()) { + ar.add(""); //$NON-NLS-1$ + } + fLines = (String[]) ar.toArray(new String[ar.size()]); } - fLines = (String[]) ar.toArray(new String[ar.size()]); } String getLine(int ix) { diff --git a/bundles/org.eclipse.team.cvs.core/.classpath b/bundles/org.eclipse.team.cvs.core/.classpath index ce7393340..22f30643c 100644 --- a/bundles/org.eclipse.team.cvs.core/.classpath +++ b/bundles/org.eclipse.team.cvs.core/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.team.cvs.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.team.cvs.core/.settings/org.eclipse.jdt.core.prefs index f644844eb..cd8aa0e9e 100644 --- a/bundles/org.eclipse.team.cvs.core/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.team.cvs.core/.settings/org.eclipse.jdt.core.prefs @@ -7,10 +7,10 @@ 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.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -37,7 +37,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.missingOverrideAnnotation=ignore org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error @@ -67,7 +66,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF index 7189a4f98..5bdd3a77b 100644 --- a/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.team.cvs.core; singleton:=true -Bundle-Version: 3.3.700.qualifier +Bundle-Version: 3.4.0.qualifier Bundle-Activator: org.eclipse.team.internal.ccvs.core.CVSProviderPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -27,4 +27,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", Bundle-ActivationPolicy: lazy Import-Package: com.ibm.icu.text, com.ibm.icu.util -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.eclipse.team.cvs.core/pom.xml b/bundles/org.eclipse.team.cvs.core/pom.xml index 962216be0..5524de50a 100644 --- a/bundles/org.eclipse.team.cvs.core/pom.xml +++ b/bundles/org.eclipse.team.cvs.core/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.team</groupId> <artifactId>org.eclipse.team.cvs.core</artifactId> - <version>3.3.700-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java index 96996950f..13fa3e4a0 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java @@ -781,6 +781,11 @@ public class Session { try { in = new GZIPInputStream(in); } catch (IOException e) { + try { + in.close(); + } catch (IOException e2) { + // Don't care. We're right about to report this IOException + } throw CVSException.wrapException(e); } } diff --git a/bundles/org.eclipse.team.cvs.ssh2/.classpath b/bundles/org.eclipse.team.cvs.ssh2/.classpath index ce7393340..22f30643c 100644 --- a/bundles/org.eclipse.team.cvs.ssh2/.classpath +++ b/bundles/org.eclipse.team.cvs.ssh2/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.team.cvs.ssh2/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.cvs.ssh2/META-INF/MANIFEST.MF index da80d5b03..324660cd6 100644 --- a/bundles/org.eclipse.team.cvs.ssh2/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.team.cvs.ssh2/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.team.cvs.ssh2; singleton:=true -Bundle-Version: 3.2.500.qualifier +Bundle-Version: 3.3.0.qualifier Bundle-Activator: org.eclipse.team.internal.ccvs.ssh2.CVSSSH2Plugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -13,4 +13,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", com.jcraft.jsch;bundle-version="[0.1.50,1.0.0)", org.eclipse.jsch.core;bundle-version="[1.1.0,2.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.eclipse.team.cvs.ssh2/pom.xml b/bundles/org.eclipse.team.cvs.ssh2/pom.xml index 01851ecf4..8226038a9 100644 --- a/bundles/org.eclipse.team.cvs.ssh2/pom.xml +++ b/bundles/org.eclipse.team.cvs.ssh2/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.team</groupId> <artifactId>org.eclipse.team.cvs.ssh2</artifactId> - <version>3.2.500-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.team.cvs.ui/.classpath b/bundles/org.eclipse.team.cvs.ui/.classpath index ce7393340..22f30643c 100644 --- a/bundles/org.eclipse.team.cvs.ui/.classpath +++ b/bundles/org.eclipse.team.cvs.ui/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.team.cvs.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.team.cvs.ui/.settings/org.eclipse.jdt.core.prefs index 8c048cdd3..5fbc8ecfe 100644 --- a/bundles/org.eclipse.team.cvs.ui/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.team.cvs.ui/.settings/org.eclipse.jdt.core.prefs @@ -7,10 +7,10 @@ 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.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -39,7 +39,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.missingOverrideAnnotation=ignore org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error @@ -74,7 +73,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF index 5dace710b..7d310e831 100644 --- a/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.team.cvs.ui; singleton:=true -Bundle-Version: 3.3.800.qualifier +Bundle-Version: 3.4.0.qualifier Bundle-Activator: org.eclipse.team.internal.ccvs.ui.CVSUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -33,4 +33,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)";resolution:=op org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)", com.ibm.icu;bundle-version="4.4.2" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.eclipse.team.cvs.ui/pom.xml b/bundles/org.eclipse.team.cvs.ui/pom.xml index c8e57a79d..53426d70c 100644 --- a/bundles/org.eclipse.team.cvs.ui/pom.xml +++ b/bundles/org.eclipse.team.cvs.ui/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.team</groupId> <artifactId>org.eclipse.team.cvs.ui</artifactId> - <version>3.3.800-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SelectionPropertyTester.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SelectionPropertyTester.java index 8c5586959..2b97b5f52 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SelectionPropertyTester.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SelectionPropertyTester.java @@ -74,7 +74,7 @@ public class SelectionPropertyTester extends PropertyTester { Method method = findMethod(clazz, property); if (method != null) { - invoke = method.invoke(instance, null); + invoke = method.invoke(instance, (Object[])null); return ((Boolean) invoke).booleanValue(); } } catch (IllegalArgumentException e) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FileDiffOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FileDiffOperation.java index 91b2f6d75..542c7449b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FileDiffOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FileDiffOperation.java @@ -57,35 +57,21 @@ public class FileDiffOperation extends DiffOperation { } protected void copyFile() throws CVSException { - FileChannel tempFileChannel=null; - FileChannel fileChannel=null; - try { - tempFileChannel = new FileInputStream(tempFile).getChannel(); - fileChannel = new FileOutputStream(file).getChannel(); - - long size= tempFileChannel.size(); + try (FileInputStream tempFileStream = new FileInputStream(tempFile); + FileOutputStream fileStream = new FileOutputStream(file)) { + + FileChannel tempFileChannel = tempFileStream.getChannel(); + FileChannel fileChannel = fileStream.getChannel(); + + long size = tempFileChannel.size(); long bytesTransferred = fileChannel.transferFrom(tempFileChannel, 0, size); - while (bytesTransferred != size){ - //Transfer from point left off until the end of the file - bytesTransferred += fileChannel.transferFrom(tempFileChannel, bytesTransferred, size); - } + while (bytesTransferred != size) { + // Transfer from point left off until the end of the file + bytesTransferred += fileChannel.transferFrom(tempFileChannel, bytesTransferred, size); + } } catch (IOException e) { - throw CVSException.wrapException(e); + throw CVSException.wrapException(e); } finally { - if (tempFileChannel!=null) - try { - tempFileChannel.close(); - } catch (IOException e) { - throw CVSException.wrapException(e); - } - - if (fileChannel!=null) - try { - fileChannel.close(); - } catch (IOException e) { - throw CVSException.wrapException(e); - } - if (tempFile != null) tempFile.delete(); } diff --git a/bundles/org.eclipse.team.ui/.classpath b/bundles/org.eclipse.team.ui/.classpath index ce7393340..22f30643c 100644 --- a/bundles/org.eclipse.team.ui/.classpath +++ b/bundles/org.eclipse.team.ui/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.team.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.team.ui/.settings/org.eclipse.jdt.core.prefs index 38c9bf987..19b37e94e 100644 --- a/bundles/org.eclipse.team.ui/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.team.ui/.settings/org.eclipse.jdt.core.prefs @@ -7,10 +7,10 @@ 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.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -43,7 +43,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.missingJavadocComments=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public @@ -79,7 +78,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF index 77b0ad625..6dad3ffef 100644 --- a/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.team.ui; singleton:=true -Bundle-Version: 3.7.300.qualifier +Bundle-Version: 3.8.0.qualifier Bundle-Activator: org.eclipse.team.internal.ui.TeamUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -34,4 +34,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)";resolution:=op Bundle-ActivationPolicy: lazy Import-Package: com.ibm.icu.text, com.ibm.icu.util -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.eclipse.team.ui/pom.xml b/bundles/org.eclipse.team.ui/pom.xml index 7761c48e2..4d9e7b112 100644 --- a/bundles/org.eclipse.team.ui/pom.xml +++ b/bundles/org.eclipse.team.ui/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.team</groupId> <artifactId>org.eclipse.team.ui</artifactId> - <version>3.7.300-SNAPSHOT</version> + <version>3.8.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/SWTUtils.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/SWTUtils.java index 9e065d667..e98487251 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/SWTUtils.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/SWTUtils.java @@ -64,7 +64,7 @@ public class SWTUtils { if (node == null) { return NLS.bind(TeamUIMessages.NotFound, pageId); } else { - return MessageFormat.format(message, new String[] { node.getLabelText() }); + return MessageFormat.format(message, node.getLabelText()); } } diff --git a/bundles/org.eclipse.ui.net/.classpath b/bundles/org.eclipse.ui.net/.classpath index ce7393340..22f30643c 100644 --- a/bundles/org.eclipse.ui.net/.classpath +++ b/bundles/org.eclipse.ui.net/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.ui.net/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.net/META-INF/MANIFEST.MF index 6c30dfa2d..f931bd419 100644 --- a/bundles/org.eclipse.ui.net/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.net/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %PLUGIN_NAME Bundle-SymbolicName: org.eclipse.ui.net; singleton:=true -Bundle-Version: 1.2.200.qualifier +Bundle-Version: 1.3.0.qualifier Bundle-Activator: org.eclipse.ui.internal.net.Activator Bundle-Vendor: %PLUGIN_PROVIDER Bundle-Localization: plugin @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.3.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)", org.eclipse.core.net;bundle-version="[1.0.0,2.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.4, +Bundle-RequiredExecutionEnvironment: JavaSE-1.8, CDC-1.1/Foundation-1.1 Export-Package: org.eclipse.ui.internal.net;x-internal:=true, org.eclipse.ui.internal.net.auth;x-internal:=true diff --git a/bundles/org.eclipse.ui.net/pom.xml b/bundles/org.eclipse.ui.net/pom.xml index d07c52943..7fc07f9b2 100644 --- a/bundles/org.eclipse.ui.net/pom.xml +++ b/bundles/org.eclipse.ui.net/pom.xml @@ -19,20 +19,6 @@ </parent> <groupId>org.eclipse.ui</groupId> <artifactId>org.eclipse.ui.net</artifactId> - <version>1.2.200-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <configuration> - <!-- - dependency on org.eclipse.equinox.security requires at least J2SE-1.4 - --> - <executionEnvironment>J2SE-1.4</executionEnvironment> - </configuration> - </plugin> - </plugins> - </build> </project> |