Skip to content

Commit

Permalink
Perform clean code of bundles/org.eclipse.equinox.p2.directorywatcher
Browse files Browse the repository at this point in the history
  • Loading branch information
@eclipse-equinox-bot
eclipse-equinox-bot committed Mar 9, 2025
1 parent eba65b6 commit 40adc23
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 41 deletions.
45 changes: 30 additions & 15 deletions ...g/eclipse/equinox/internal/provisional/p2/directorywatcher/CachingArtifactRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,16 @@ public void save() {
}

void saveRemovals() {
for (IArtifactDescriptor desc : descriptorsToRemove)
for (IArtifactDescriptor desc : descriptorsToRemove) {
innerRepo.removeDescriptor(desc);
}
descriptorsToRemove.clear();
}

void saveAdditions() {
if (descriptorsToAdd.isEmpty())
if (descriptorsToAdd.isEmpty()) {
return;
}
innerRepo.addDescriptors(descriptorsToAdd.toArray(new IArtifactDescriptor[descriptorsToAdd.size()]));
descriptorsToAdd.clear();
artifactMap.clear();
Expand Down Expand Up @@ -93,8 +95,9 @@ private void unmapDescriptor(IArtifactDescriptor descriptor) {
}

descriptors.remove(descriptor);
if (descriptors.isEmpty())
if (descriptors.isEmpty()) {
artifactMap.remove(key);
}
}

@Override
Expand All @@ -108,8 +111,9 @@ public synchronized void addDescriptors(IArtifactDescriptor[] descriptors, IProg
subMonitor.worked(1);
}
} finally {
if (monitor != null)
if (monitor != null) {
monitor.done();
}
}
}

Expand All @@ -129,8 +133,9 @@ public synchronized void addDescriptor(IArtifactDescriptor toAdd, IProgressMonit
mapDescriptor(toAdd);
subMonitor.worked(1);
} finally {
if (monitor != null)
if (monitor != null) {
monitor.done();
}
}
}

Expand All @@ -143,8 +148,9 @@ public final synchronized void addDescriptor(IArtifactDescriptor toAdd) {
@Override
public synchronized IArtifactDescriptor[] getArtifactDescriptors(IArtifactKey key) {
List<IArtifactDescriptor> result = artifactMap.get(key);
if (result == null)
if (result == null) {
return innerRepo.getArtifactDescriptors(key);
}
result = new ArrayList<>(result);
result.addAll(Arrays.asList(innerRepo.getArtifactDescriptors(key)));
return result.toArray(new IArtifactDescriptor[result.size()]);
Expand Down Expand Up @@ -190,8 +196,9 @@ public synchronized final void removeAll(IProgressMonitor monitor) {
}
subMonitor.worked(1);
} finally {
if (monitor != null)
if (monitor != null) {
monitor.done();
}
}
}

Expand All @@ -208,8 +215,9 @@ public synchronized void removeDescriptor(IArtifactDescriptor descriptor, IProgr
doRemoveArtifact(descriptor);
subMonitor.worked(1);
} finally {
if (monitor != null)
if (monitor != null) {
monitor.done();
}
}
}

Expand All @@ -229,8 +237,9 @@ public synchronized void removeDescriptor(IArtifactKey key, IProgressMonitor mon
subMonitor.worked(1);
}
} finally {
if (monitor != null)
if (monitor != null) {
monitor.done();
}
}
}

Expand All @@ -249,8 +258,9 @@ public synchronized void removeDescriptors(IArtifactDescriptor[] descriptors, IP
subMonitor.worked(1);
}
} finally {
if (monitor != null)
if (monitor != null) {
monitor.done();
}
}
}

Expand All @@ -269,8 +279,9 @@ public synchronized void removeDescriptors(IArtifactKey[] keys, IProgressMonitor
subMonitor.worked(1);
}
} finally {
if (monitor != null)
if (monitor != null) {
monitor.done();
}
}
}

Expand All @@ -287,8 +298,9 @@ public final synchronized void removeDescriptors(IArtifactKey[] keys) {
private boolean doRemoveArtifact(IArtifactDescriptor descriptor) {
// if the descriptor is already in the pending additoins, remove it
boolean result = descriptorsToAdd.remove(descriptor);
if (result)
if (result) {
unmapDescriptor(descriptor);
}
// either way, note this as a descriptor to remove from the inner repo
descriptorsToRemove.add(descriptor);
return result;
Expand Down Expand Up @@ -352,8 +364,9 @@ public String setProperty(String key, String value, IProgressMonitor monitor) {
propertyChanges.put(key, value == null ? NULL : value);
return result;
} finally {
if (monitor != null)
if (monitor != null) {
monitor.done();
}
}
}

Expand All @@ -369,15 +382,17 @@ public <T> T getAdapter(Class<T> adapter) {

@Override
public File getArtifactFile(IArtifactKey key) {
if (innerRepo instanceof IFileArtifactRepository)
if (innerRepo instanceof IFileArtifactRepository) {
return ((IFileArtifactRepository) innerRepo).getArtifactFile(key);
}
return null;
}

@Override
public File getArtifactFile(IArtifactDescriptor descriptor) {
if (innerRepo instanceof IFileArtifactRepository)
if (innerRepo instanceof IFileArtifactRepository) {
return ((IFileArtifactRepository) innerRepo).getArtifactFile(descriptor);
}
return null;
}

Expand Down
36 changes: 24 additions & 12 deletions ...er/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/DirectoryWatcher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,24 +74,27 @@ public static void log(String string, Throwable e) {

public DirectoryWatcher(Map<String, String> properties, BundleContext context) {
String dir = properties.get(DIR);
if (dir == null)
if (dir == null) {
dir = "./load"; //$NON-NLS-1$
}

File targetDirectory = new File(dir);
targetDirectory.mkdirs();
directories = new File[] {targetDirectory};
}

public DirectoryWatcher(File directory) {
if (directory == null)
if (directory == null) {
throw new IllegalArgumentException(Messages.null_folder);
}

this.directories = new File[] {directory};
}

public DirectoryWatcher(File[] directories) {
if (directories == null)
if (directories == null) {
throw new IllegalArgumentException(Messages.null_folder);
}
this.directories = directories;
}

Expand All @@ -114,16 +117,18 @@ public synchronized void poll() {
}

public synchronized void start(final long pollFrequency) {
if (watcher != null)
if (watcher != null) {
throw new IllegalStateException(Messages.thread_started);
}

watcher = new WatcherThread(pollFrequency);
watcher.start();
}

public synchronized void stop() {
if (watcher == null)
if (watcher == null) {
throw new IllegalStateException(Messages.thread_not_started);
}

watcher.done();
watcher = null;
Expand All @@ -137,15 +142,17 @@ private void startPoll() {
removals = scannedFiles;
scannedFiles = new HashSet<>();
pendingDeletions = new HashSet<>();
for (DirectoryChangeListener listener : listeners)
for (DirectoryChangeListener listener : listeners) {
listener.startPoll();
}
}

private void scanDirectories() {
for (File directory : directories) {
File list[] = directory.listFiles();
if (list == null)
if (list == null) {
continue;
}
for (File file : list) {
// if this is a deletion marker then add to the list of pending deletions.
if (file.getPath().endsWith(DEL_EXT)) {
Expand All @@ -158,8 +165,9 @@ private void scanDirectories() {
scannedFiles.add(file);
removals.remove(file);
for (DirectoryChangeListener listener : listeners) {
if (isInterested(listener, file))
if (isInterested(listener, file)) {
processFile(file, listener);
}
}
}
}
Expand All @@ -169,8 +177,9 @@ private void scanDirectories() {
private void stopPoll() {
notifyRemovals();
removals = scannedFiles;
for (DirectoryChangeListener listener : listeners)
for (DirectoryChangeListener listener : listeners) {
listener.stopPoll();
}
processPendingDeletions();
}

Expand All @@ -185,8 +194,9 @@ private void notifyRemovals() {
Set<File> removed = removals;
for (DirectoryChangeListener listener : listeners) {
for (File file : removed) {
if (isInterested(listener, file))
if (isInterested(listener, file)) {
listener.removed(file);
}
}
}
}
Expand All @@ -200,8 +210,9 @@ private void processFile(File file, DirectoryChangeListener listener) {
} else {
// The file is not new but may have changed
long lastModified = file.lastModified();
if (oldTimestamp.longValue() != lastModified)
if (oldTimestamp.longValue() != lastModified) {
listener.changed(file);
}
}
} catch (Exception e) {
log(NLS.bind(Messages.error_processing, listener), e);
Expand All @@ -214,8 +225,9 @@ private void processFile(File file, DirectoryChangeListener listener) {
private void processPendingDeletions() {
for (Iterator<File> iterator = pendingDeletions.iterator(); iterator.hasNext();) {
File file = iterator.next();
if (!file.exists() || file.delete())
if (!file.exists() || file.delete()) {
iterator.remove();
}
new File(file.getPath() + DEL_EXT).delete();
}
}
Expand Down
13 changes: 8 additions & 5 deletions ...watcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/EntryAdvice.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,22 @@ void setProperties(File location, long timestamp, URI reference) {
}

void setProperties(File location, long timestamp, URI reference, String linkFile) {
if (reference == null)
if (reference == null) {
artifactProps.remove(RepositoryListener.ARTIFACT_REFERENCE);
else
} else {
artifactProps.put(RepositoryListener.ARTIFACT_REFERENCE, reference.toString());
if (location.isDirectory())
}
if (location.isDirectory()) {
artifactProps.put(RepositoryListener.ARTIFACT_FOLDER, Boolean.TRUE.toString());
else
} else {
artifactProps.remove(RepositoryListener.ARTIFACT_FOLDER);
}
artifactProps.put(RepositoryListener.FILE_NAME, location.getAbsolutePath());
metadataProps.put(RepositoryListener.FILE_NAME, location.getAbsolutePath());
metadataProps.put(RepositoryListener.FILE_LAST_MODIFIED, Long.toString(timestamp));
if (linkFile != null)
if (linkFile != null) {
metadataProps.put(Site.PROP_LINK_FILE, linkFile);
}
}

@Override
Expand Down
Loading

0 comments on commit 40adc23

Please sign in to comment.