Skip to content
Snippets Groups Projects
Commit 6756b9d4 authored by Nitin Dahyabhai's avatar Nitin Dahyabhai
Browse files

Update compiler targets, other updates

parent b4ddaa26
Branches R3_6_0_patches
Tags v201406201440
No related merge requests found
Showing
with 48 additions and 45 deletions
#Wed May 20 09:30:27 EEST 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.source=1.8
#Wed May 20 09:30:27 EEST 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.source=1.8
#Mon May 11 09:52:55 EEST 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.source=1.8
#Mon May 11 09:52:55 EEST 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.source=1.8
......@@ -113,6 +113,6 @@ public class ComponentUIPlugin extends AbstractUIPlugin implements IStartup
public String getPluginStateLocation()
{
return Platform.getPluginStateLocation(this).addTrailingSeparator().toOSString();
return getStateLocation().addTrailingSeparator().toOSString();
}
}
\ No newline at end of file
/*******************************************************************************
* Copyright (c) 2005, 2007 IBM Corporation and others.
* Copyright (c) 2005, 2025 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
......@@ -29,6 +29,7 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.IJobManager;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.wtp.releng.tools.component.IClazz;
import org.eclipse.wtp.releng.tools.component.ILocation;
import org.eclipse.wtp.releng.tools.component.api.Source;
......@@ -160,7 +161,7 @@ public class ScannableComponent implements IResourceProxyVisitor
lastScan = -1;
newClasses.clear();
List sources = new ArrayList();
IJobManager jobManager = Platform.getJobManager();
IJobManager jobManager = Job.getJobManager();
for (int i = 0; i < projects.size(); i++)
{
IProject project = (IProject)projects.get(i);
......
......@@ -60,7 +60,7 @@ public class Scan4APIViolation extends Action implements IActionDelegate
String platformPath = pdePref.get("platform_path", null);
String src = platformPath != null ? platformPath : Platform.getInstallLocation().toString();
// Get outputDir
IPath outputDir = Platform.getPluginStateLocation(ComponentUIPlugin.getDefault());
IPath outputDir = ComponentUIPlugin.getDefault().getStateLocation();
String compXMLOutputDir = outputDir.addTrailingSeparator().append(src.replace(':', '_').replace('/', '_').replace('\\', '_')).toString();
if (!(new File(compXMLOutputDir).exists()))
{
......
......@@ -20,12 +20,12 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
......@@ -46,7 +46,7 @@ public class Scan4MissingJavadoc extends Action implements IActionDelegate
{
public void run()
{
String outputDir = Platform.getPluginStateLocation(ComponentUIPlugin.getDefault()).append("_output_").toString();
String outputDir = ComponentUIPlugin.getDefault().getStateLocation().append("_output_").toString();
delete(new File(outputDir));
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
if (window != null)
......
......@@ -19,6 +19,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspaceRoot;
......@@ -60,7 +61,7 @@ public class Scan4NonAPIDependency extends Action implements IActionDelegate
String src = platformPath != null ? platformPath : Platform.getInstallLocation().toString();
// Get outputDir
IPath outputDir = Platform.getPluginStateLocation(ComponentUIPlugin.getDefault());
IPath outputDir = ComponentUIPlugin.getDefault().getStateLocation();
String compXMLOutputDir = outputDir.addTrailingSeparator().append(src.replace(':', '_').replace('/', '_').replace('\\', '_')).toString();
if (!(new File(compXMLOutputDir).exists()))
{
......
/*******************************************************************************
* Copyright (c) 2005, 2007 IBM Corporation and others.
* Copyright (c) 2005, 2025 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
......@@ -46,7 +46,7 @@ public class Scan4UnitTestCoverage extends Action implements IActionDelegate
{
public void run()
{
String outputDir = Platform.getPluginStateLocation(ComponentUIPlugin.getDefault()).append("_output_").toString();
String outputDir = ComponentUIPlugin.getDefault().getStateLocation().append("_output_").toString();
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
if (window != null)
{
......
......@@ -15,11 +15,11 @@ package org.eclipse.wtp.releng.tools.component.ui.internal.job;
import java.util.Collection;
import java.util.Iterator;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.IJobManager;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.wtp.releng.tools.component.api.ClassUse;
......@@ -114,7 +114,7 @@ public abstract class AbstractModifyMarkersJob extends Job
private void createMarker(IResource resource, String message, int line) throws CoreException
{
IJobManager jobManager = Platform.getJobManager();
IJobManager jobManager = Job.getJobManager();
try
{
jobManager.beginRule(resource, new NullProgressMonitor());
......@@ -145,7 +145,7 @@ public abstract class AbstractModifyMarkersJob extends Job
{
if (markers[i].getAttribute(ComponentManager.MARKER_COMPONENT_VIOLATION) != null)
{
IJobManager jobManager = Platform.getJobManager();
IJobManager jobManager = Job.getJobManager();
try
{
jobManager.beginRule(res, new NullProgressMonitor());
......
......@@ -14,8 +14,8 @@
package org.eclipse.wtp.releng.tools.component.ui.internal.job;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.IJobManager;
import org.eclipse.core.runtime.jobs.Job;
public abstract class AbstractScanJob extends AbstractModifyMarkersJob
{
......@@ -31,7 +31,7 @@ public abstract class AbstractScanJob extends AbstractModifyMarkersJob
{
try
{
IJobManager jobManager = Platform.getJobManager();
IJobManager jobManager = Job.getJobManager();
jobManager.join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
jobManager.join(ResourcesPlugin.FAMILY_MANUAL_BUILD, null);
interrupted = false;
......
/*******************************************************************************
* Copyright (c) 2005, 2007 IBM Corporation and others.
* Copyright (c) 2005, 2025 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
......@@ -18,6 +18,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
......@@ -26,9 +27,9 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.IJobManager;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.wtp.releng.tools.component.api.ClassUse;
import org.eclipse.wtp.releng.tools.component.api.Source;
import org.eclipse.wtp.releng.tools.component.ui.ComponentManager;
......@@ -62,7 +63,7 @@ public class ScanComponent extends AbstractScanJob
public IStatus run(IProgressMonitor monitor)
{
IJobManager jobManager = Platform.getJobManager();
IJobManager jobManager = Job.getJobManager();
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
try
{
......
#Thu Mar 11 21:59:22 EST 2010
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
<?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">
<accessrules>
<accessrule kind="accessible" pattern="sun/net/www/protocol/http/Handler"/>
</accessrules>
......
#Thu Sep 22 07:10:39 EDT 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.3
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
......@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Httphandler
Bundle-SymbolicName: org.eclipse.wtp.releng.www.protocol.http
Bundle-Version: 1.1.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Bundle-Version: 1.2.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse Web Tools Platform
......@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.releng</groupId>
<artifactId>org.eclipse.wtp.releng.httphandler</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
/*******************************************************************************
* Copyright (c) 2004, 2008 IBM Corporation and others.
* Copyright (c) 2004, 2025 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
......@@ -62,7 +62,7 @@ public class PrintXercesVersion implements IApplication {
System.out.println("Resolver Version: " + "NoClassDefFoundError: " + e.getMessage());
}
System.out.println("XMLCommons Version: " + org.apache.xmlcommons.Version.getVersion());
// System.out.println("XMLCommons Version: " + org.apache.xmlcommons.Version.getVersion());
System.out.println();
System.out.println("------");
}
......
/*******************************************************************************
* Copyright (c) 2004, 2007 IBM Corporation and others.
* Copyright (c) 2004, 2025 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
......@@ -77,8 +77,8 @@ public class TestviaJUnitPlugin extends TestCase {
+ e.getMessage());
}
System.out.println("XMLCommons Version: "
+ org.apache.xmlcommons.Version.getVersion());
// System.out.println("XMLCommons Version: "
// + org.apache.xmlcommons.Version.getVersion());
System.out.println();
System.out.println("------");
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment