Commit 3d722388 authored by Emmanuel Bourg's avatar Emmanuel Bourg

New upstream version 4.10

parent 6cd145e6
Contributing to Equinox
=======================
# Contributing to Eclipse Equinox
Thanks for your interest in this project.
Project description:
--------------------
## Project description
Equinox is an implementation of the OSGi R5 core framework specification, a set of bundles that implement various optional OSGi services and other infrastructure for running OSGi-based systems.
Eclipse Equinox is an implementation of the OSGi R6 core framework
specification, a set of bundles that implement various optional OSGi services
and other infrastructure for running OSGi-based systems.
- https://projects.eclipse.org/projects/rt.equinox
* https://projects.eclipse.org/projects/eclipse.equinox
Developer resources:
--------------------
## Developer resources
Information regarding source code management, builds, coding standards, and more.
Information regarding source code management, builds, coding standards, and
more.
- https://projects.eclipse.org/projects/rt.equinox/developer
* https://projects.eclipse.org/projects/eclipse.equinox/developer
Contributor License Agreement:
------------------------------
The project maintains the following source code repositories
Before your contribution can be accepted by the project, you need to create and electronically sign the Eclipse Foundation Contributor License Agreement (ECA).
* http://git.eclipse.org/c/equinox/rt.equinox.binaries.git
* http://git.eclipse.org/c/equinox/rt.equinox.bundles.git
* http://git.eclipse.org/c/equinox/rt.equinox.framework.git
* http://git.eclipse.org/c/equinox/rt.equinox.p2.git
- http://www.eclipse.org/legal/ECA.php
This project uses Bugzilla to track ongoing development and issues.
Contact:
--------
* Search for issues: https://eclipse.org/bugs/buglist.cgi?product=Equinox
* Create a new report: https://eclipse.org/bugs/enter_bug.cgi?product=Equinox
Contact the project developers via the project's "dev" list.
Be sure to search for existing bugs before you create another one. Remember that
contributions are always welcome!
- https://dev.eclipse.org/mailman/listinfo/equinox-dev
## Eclipse Contributor Agreement
Search for bugs:
----------------
Before your contribution can be accepted by the project team contributors must
electronically sign the Eclipse Contributor Agreement (ECA).
This project uses Bugzilla to track ongoing development and issues.
* http://www.eclipse.org/legal/ECA.php
- https://bugs.eclipse.org/bugs/buglist.cgi?product=Equinox
Commits that are provided by non-committers must have a Signed-off-by field in
the footer indicating that the author is aware of the terms by which the
contribution has been provided to the project. The non-committer must
additionally have an Eclipse Foundation account and must have a signed Eclipse
Contributor Agreement (ECA) on file.
Create a new bug:
-----------------
For more information, please see the Eclipse Committer Handbook:
https://www.eclipse.org/projects/handbook/#resources-commit
Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome!
## Contact
Contact the project developers via the project's "dev" list.
- https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Equinox
* https://dev.eclipse.org/mailman/listinfo/equinox-dev
\ No newline at end of file
This diff is collapsed.
# Notices for Eclipse Equinox
This content is produced and maintained by the Eclipse Equinox project.
* Project home: https://projects.eclipse.org/projects/eclipse.equinox
## Trademarks
Eclipse Equinox, and Equinox are trademarks of the Eclipse Foundation.
## Copyright
All content is the property of the respective authors or their employers. For
more information regarding authorship of content, please consult the listed
source code repository logs.
## Declared Project Licenses
This program and the accompanying materials are made available under the terms
of the Eclipse Public License v. 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0.
SPDX-License-Identifier: EPL-2.0
## Source Code
The project maintains the following source code repositories:
* http://git.eclipse.org/c/equinox/rt.equinox.binaries.git
* http://git.eclipse.org/c/equinox/rt.equinox.bundles.git
* http://git.eclipse.org/c/equinox/rt.equinox.framework.git
* http://git.eclipse.org/c/equinox/rt.equinox.p2.git
\ No newline at end of file
#Tue Oct 18 16:14:30 EEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=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/OSGi%Minimum-1.2"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="osgi">
<attributes>
......
#Tue Feb 24 16:30:45 CST 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
......@@ -7,17 +6,28 @@ 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.1
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
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.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.3
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000
org.eclipse.jdt.core.compiler.problem.APILeak=warning
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=ignore
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
org.eclipse.jdt.core.compiler.problem.deadCode=warning
......@@ -26,7 +36,8 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=error
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.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
......@@ -34,6 +45,7 @@ org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
......@@ -41,7 +53,9 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
......@@ -49,46 +63,71 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
org.eclipse.jdt.core.compiler.problem.nullReference=warning
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=error
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.3
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
......
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.app; singleton:=true
Bundle-Version: 1.3.600.qualifier
Bundle-Version: 1.4.0.qualifier
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.equinox.internal.app.Activator
Bundle-Localization: plugin
......@@ -30,7 +30,5 @@ DynamicImport-Package: org.osgi.service.event;version="1.0.0"
Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2
Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.2,
CDC-1.1/Foundation-1.1,
J2SE-1.4
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Automatic-Module-Name: org.eclipse.equinox.app
......@@ -14,12 +14,12 @@
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
<version>4.9.0-SNAPSHOT</version>
<version>4.10.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.app</artifactId>
<version>1.3.600-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
......@@ -29,7 +29,7 @@
<version>${tycho.version}</version>
<configuration>
<compilerArgs>
<arg>-nowarn:[${project.basedir}/osgi]</arg>
<arg>-nowarn</arg>
</compilerArgs>
</configuration>
</plugin>
......
/*******************************************************************************
* Copyright (c) 2005, 2011 IBM Corporation and others.
* Copyright (c) 2005, 2018 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
......@@ -30,12 +30,12 @@ public interface IApplication {
/**
* Exit object indicating normal termination
*/
public static final Integer EXIT_OK = new Integer(0);
public static final Integer EXIT_OK = Integer.valueOf(0);
/**
* Exit object requesting platform restart
*/
public static final Integer EXIT_RESTART = new Integer(23);
public static final Integer EXIT_RESTART = Integer.valueOf(23);
/**
* Exit object requesting that the command passed back be executed. Typically
......@@ -43,7 +43,7 @@ public interface IApplication {
* relaunched the command line will be retrieved from the
* {@link IApplicationContext#EXIT_DATA_PROPERTY eclipse.exitdata} system property.
*/
public static final Integer EXIT_RELAUNCH = new Integer(24);
public static final Integer EXIT_RELAUNCH = Integer.valueOf(24);
/**
* Starts this application with the given context and returns a result. The content of
......
/*******************************************************************************
* Copyright (c) 2005, 2008 IBM Corporation and others.
* Copyright (c) 2005, 2018 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
......@@ -42,6 +42,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
private ServiceTracker registryTracker;
private IExtensionRegistry registry;
@Override
public void start(BundleContext bc) {
_context = bc;
// doing simple get service here because we expect the PackageAdmin service to always be available
......@@ -65,6 +66,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
}
}
@Override
public void stop(BundleContext bc) {
// stop the app commands for the console
try {
......@@ -114,6 +116,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
CommandLineArgs.processCommandLine(envInfo);
}
@Override
public Object addingService(ServiceReference reference) {
BundleContext context = _context;
if (context == null)
......@@ -143,10 +146,12 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
return null;
}
@Override
public void modifiedService(ServiceReference reference, Object service) {
// do nothing
}
@Override
public void removedService(ServiceReference reference, Object service) {
EclipseAppContainer currentContainer = null;
synchronized (this) {
......@@ -169,6 +174,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
tracker.open(allServices);
else
AccessController.doPrivileged(new PrivilegedAction() {
@Override
public Object run() {
tracker.open(allServices);
return null;
......@@ -181,6 +187,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
if (System.getSecurityManager() == null)
return tracker.getService();
return AccessController.doPrivileged(new PrivilegedAction() {
@Override
public Object run() {
return tracker.getService();
}
......@@ -192,6 +199,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
if (System.getSecurityManager() == null)
return bundle.getLocation();
return (String) AccessController.doPrivileged(new PrivilegedAction() {
@Override
public Object run() {
return bundle.getLocation();
}
......
/*******************************************************************************
* Copyright (c) 2005, 2006 IBM Corporation and others.
* Copyright (c) 2005, 2018 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
......@@ -16,13 +16,14 @@ package org.eclipse.equinox.internal.app;
import org.eclipse.osgi.framework.log.FrameworkLogEntry;
public class AnyThreadAppLauncher implements Runnable{
public class AnyThreadAppLauncher implements Runnable {
private EclipseAppHandle appHandle;
private AnyThreadAppLauncher(EclipseAppHandle appHandle) {
this.appHandle = appHandle;
}
@Override
public void run() {
try {
// pasing null will cause EclipseAppHandle to get the correct arguments
......
/*******************************************************************************
* Copyright (c) 2005, 2011 IBM Corporation and others.
* Copyright (c) 2005, 2018 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
......@@ -89,6 +89,7 @@ public class AppCommands implements CommandProvider {
scheduledApplications.close();
}
@Override
public String getHelp() {
return getHelp(null);
}
......
/*******************************************************************************
* Copyright (c) 2005, 2009 IBM Corporation and others.
* Copyright (c) 2005, 2018 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
......@@ -187,9 +187,9 @@ public class AppPersistence implements ServiceTrackerCustomizer {
}
if (nextScheduledID == Integer.MAX_VALUE)
nextScheduledID = 0;
String result = new Integer(nextScheduledID++).toString();
String result = Integer.valueOf(nextScheduledID++).toString();
while (scheduledApps.get(result) != null && nextScheduledID < Integer.MAX_VALUE)
result = new Integer(nextScheduledID++).toString();
result = Integer.valueOf(nextScheduledID++).toString();
if (nextScheduledID == Integer.MAX_VALUE)
throw new ApplicationException(ApplicationException.APPLICATION_DUPLICATE_SCHEDULE_ID, "Maximum number of scheduled applications reached"); //$NON-NLS-1$
return result;
......@@ -242,9 +242,8 @@ public class AppPersistence implements ServiceTrackerCustomizer {
}
private static void loadLocks(File locksData) throws IOException {
ObjectInputStream in = null;
try {
in = new ObjectInputStream(new FileInputStream(locksData));
try (ObjectInputStream in = new ObjectInputStream(new FileInputStream(locksData));) {
int dataVersion = in.readInt();
if (dataVersion != DATA_VERSION)
return;
......@@ -253,16 +252,11 @@ public class AppPersistence implements ServiceTrackerCustomizer {
for (int i = 0; i < numLocks; i++)
locks.add(in.readUTF());
}
} finally {
if (in != null)
in.close();
}
}
private static void loadSchedules(File schedulesData) throws IOException {
ObjectInputStream in = null;
try {
in = new ObjectInputStream(new FileInputStream(schedulesData));
try (ObjectInputStream in = new ObjectInputStream(new FileInputStream(schedulesData))) {
int dataVersion = in.readInt();
if (dataVersion != DATA_VERSION)
return;
......@@ -283,9 +277,6 @@ public class AppPersistence implements ServiceTrackerCustomizer {
throw new IOException(e.getMessage());
} catch (ClassNotFoundException e) {
throw new IOException(e.getMessage());
} finally {
if (in != null)
in.close();
}
}
......@@ -307,24 +298,17 @@ public class AppPersistence implements ServiceTrackerCustomizer {
// must call this while holding the locks lock
private static void saveLocks(File locksData) throws IOException {
ObjectOutputStream out = null;
try {
out = new ObjectOutputStream(new FileOutputStream(locksData));
try (ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream(locksData))) {
out.writeInt(DATA_VERSION);
out.writeInt(locks.size());
for (Iterator iterLocks = locks.iterator(); iterLocks.hasNext();)
out.writeUTF((String) iterLocks.next());
} finally {
if (out != null)
out.close();
}
}
// must call this while holding the scheduledApps lock
private static void saveSchedules(File schedulesData) throws IOException {
ObjectOutputStream out = null;
try {
out = new ObjectOutputStream(new FileOutputStream(schedulesData));
try (ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream(schedulesData))) {
out.writeInt(DATA_VERSION);
out.writeInt(scheduledApps.size());
for (Iterator apps = scheduledApps.values().iterator(); apps.hasNext();) {
......@@ -336,9 +320,6 @@ public class AppPersistence implements ServiceTrackerCustomizer {
out.writeBoolean(app.isRecurring());
out.writeObject(app.getArguments());
}
} finally {
if (out != null)
out.close();
}
}
......@@ -354,6 +335,7 @@ public class AppPersistence implements ServiceTrackerCustomizer {
}
static class AppTimer implements Runnable {
@Override
public void run() {
int lastMin = -1;
while (!shutdown) {
......@@ -365,12 +347,12 @@ public class AppPersistence implements ServiceTrackerCustomizer {
continue;
lastMin = minute;
Hashtable props = new Hashtable();
props.put(ScheduledApplication.YEAR, new Integer(cal.get(Calendar.YEAR)));
props.put(ScheduledApplication.MONTH, new Integer(cal.get(Calendar.MONTH)));
props.put(ScheduledApplication.DAY_OF_MONTH, new Integer(cal.get(Calendar.DAY_OF_MONTH)));
props.put(ScheduledApplication.DAY_OF_WEEK, new Integer(cal.get(Calendar.DAY_OF_WEEK)));
props.put(ScheduledApplication.HOUR_OF_DAY, new Integer(cal.get(Calendar.HOUR_OF_DAY)));
props.put(ScheduledApplication.MINUTE, new Integer(minute));
props.put(ScheduledApplication.YEAR, Integer.valueOf(cal.get(Calendar.YEAR)));
props.put(ScheduledApplication.MONTH, Integer.valueOf(cal.get(Calendar.MONTH)));
props.put(ScheduledApplication.DAY_OF_MONTH, Integer.valueOf(cal.get(Calendar.DAY_OF_MONTH)));
props.put(ScheduledApplication.DAY_OF_WEEK, Integer.valueOf(cal.get(Calendar.DAY_OF_WEEK)));
props.put(ScheduledApplication.HOUR_OF_DAY, Integer.valueOf(cal.get(Calendar.HOUR_OF_DAY)));
props.put(ScheduledApplication.MINUTE, Integer.valueOf(minute));
Event timerEvent = new Event(ScheduledApplication.TIMER_TOPIC, (Dictionary) props);
EclipseScheduledApplication[] apps = null;
// poor mans implementation of dispatching events; the spec will not allow us to use event admin to dispatch the virtual timer events; boo!!
......@@ -413,6 +395,7 @@ public class AppPersistence implements ServiceTrackerCustomizer {
}
}
@Override
public Object addingService(ServiceReference reference) {
if (configLocation != null)
return null; // only care about one configuration
......@@ -422,10 +405,12 @@ public class AppPersistence implements ServiceTrackerCustomizer {
return configLocation;
}
@Override
public void modifiedService(ServiceReference reference, Object service) {
// don't care