Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2015-09-28 18:49:18 +0000
committerRyan D. Brooks2015-09-28 18:49:18 +0000
commit071fcbc5cca4e22e650bb459701f5fc9be701013 (patch)
treeac629d866ecfea675bc4e134c68315440282d560 /plugins/org.eclipse.osee.framework.ui.workspacebundleloader
parentb4f6f62b0d3af365b67a3786dbb24c97fa638536 (diff)
downloadorg.eclipse.osee-071fcbc5cca4e22e650bb459701f5fc9be701013.tar.gz
org.eclipse.osee-071fcbc5cca4e22e650bb459701f5fc9be701013.tar.xz
org.eclipse.osee-071fcbc5cca4e22e650bb459701f5fc9be701013.zip
refactor: Use type inference when invoking a generic constructor
Diffstat (limited to 'plugins/org.eclipse.osee.framework.ui.workspacebundleloader')
-rw-r--r--plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/BundleCollection.java10
-rw-r--r--plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/FileChangeDetector.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/JarCollectionNature.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/WorkspaceBundleLoadCoordinator.java10
-rw-r--r--plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/internal/ManagedFolderArea.java2
5 files changed, 14 insertions, 14 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/BundleCollection.java b/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/BundleCollection.java
index 9fc6001c937..98d7304470f 100644
--- a/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/BundleCollection.java
+++ b/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/BundleCollection.java
@@ -20,8 +20,8 @@ import java.util.Map;
public class BundleCollection {
- Map<String, List<BundleInfoLite>> bundleByName = new HashMap<String, List<BundleInfoLite>>();
- Map<URL, BundleInfoLite> bundleByURL = new HashMap<URL, BundleInfoLite>();
+ Map<String, List<BundleInfoLite>> bundleByName = new HashMap<>();
+ Map<URL, BundleInfoLite> bundleByURL = new HashMap<>();
public BundleCollection(){
@@ -30,7 +30,7 @@ public class BundleCollection {
public void add(BundleInfoLite bundle){
List<BundleInfoLite> bundles = bundleByName.get(bundle.getSymbolicName());
if(bundles == null){
- bundles = new ArrayList<BundleInfoLite>();
+ bundles = new ArrayList<>();
bundleByName.put(bundle.getSymbolicName(), bundles);
}
bundles.add(bundle);
@@ -46,7 +46,7 @@ public class BundleCollection {
}
public List<BundleInfoLite> getInstalledBundles() {
- List<BundleInfoLite> bundles = new ArrayList<BundleInfoLite>();
+ List<BundleInfoLite> bundles = new ArrayList<>();
for(BundleInfoLite info: bundleByURL.values()){
if(info.isInstalled()){
bundles.add(info);
@@ -56,7 +56,7 @@ public class BundleCollection {
}
public List<BundleInfoLite> getLatestBundles() {
- List<BundleInfoLite> latest = new ArrayList<BundleInfoLite>();
+ List<BundleInfoLite> latest = new ArrayList<>();
for(List<BundleInfoLite> infolist:this.bundleByName.values()){
if(infolist.size() == 1){
latest.add(infolist.get(0));
diff --git a/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/FileChangeDetector.java b/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/FileChangeDetector.java
index 8937d5dce43..976ebf7869e 100644
--- a/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/FileChangeDetector.java
+++ b/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/FileChangeDetector.java
@@ -28,7 +28,7 @@ public class FileChangeDetector {
private final ConcurrentHashMap<URL, byte[]> bundleNameToMd5Map;
public FileChangeDetector() {
- bundleNameToMd5Map = new ConcurrentHashMap<URL, byte[]>();
+ bundleNameToMd5Map = new ConcurrentHashMap<>();
}
public boolean isChanged(URL url) {
diff --git a/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/JarCollectionNature.java b/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/JarCollectionNature.java
index 86e79862d04..e6b694f5b49 100644
--- a/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/JarCollectionNature.java
+++ b/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/JarCollectionNature.java
@@ -85,7 +85,7 @@ public class JarCollectionNature implements IProjectNature {
}
public Collection<URL> getBundles() {
- Collection<URL> urls = new ArrayList<URL>();
+ Collection<URL> urls = new ArrayList<>();
if (isClosing) {
return urls;
@@ -154,7 +154,7 @@ public class JarCollectionNature implements IProjectNature {
IWorkspaceRoot workspaceRoot = workspace.getRoot();
IProject[] projects = workspaceRoot.getProjects();
- Collection<T> natures = new LinkedList<T>();
+ Collection<T> natures = new LinkedList<>();
for (IProject project : projects) {
if (project.isOpen()) {
diff --git a/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/WorkspaceBundleLoadCoordinator.java b/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/WorkspaceBundleLoadCoordinator.java
index 4967e6cb156..70b35f2fe29 100644
--- a/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/WorkspaceBundleLoadCoordinator.java
+++ b/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/WorkspaceBundleLoadCoordinator.java
@@ -79,7 +79,7 @@ public class WorkspaceBundleLoadCoordinator {
private FrameworkWiring wiring;
public WorkspaceBundleLoadCoordinator(File temporaryBundleLocationFolder) {
- bundlesToCheck = new HashSet<String>();
+ bundlesToCheck = new HashSet<>();
this.managedFolderArea = new ManagedFolderArea(temporaryBundleLocationFolder);
managedFolderArea.initialize();
this.wiring = getFrameworkWiring();
@@ -277,7 +277,7 @@ public class WorkspaceBundleLoadCoordinator {
}
private Set<String> determineManagedViews(List<BundleInfoLite> uninstallList){
- Set<String> managedViewIds = new HashSet<String>();
+ Set<String> managedViewIds = new HashSet<>();
IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint("org.eclipse.ui.views");
IExtension[] extensions = extensionPoint.getExtensions();
@@ -353,7 +353,7 @@ public class WorkspaceBundleLoadCoordinator {
private List<BundleInfoLite> determineDeltasBetweenBundlesToLoad() {
- List<BundleInfoLite> bundlesToOperateOn = new ArrayList<BundleInfoLite>();
+ List<BundleInfoLite> bundlesToOperateOn = new ArrayList<>();
for(String urlString:bundlesToCheck){
try {
URL newURL;
@@ -410,8 +410,8 @@ public class WorkspaceBundleLoadCoordinator {
public synchronized void installLatestBundles(final IProgressMonitor subMonitor){
final List<BundleInfoLite> bundles = managedArea.getLatestBundles();
- Collection<Bundle> bundlesToRefresh = new ArrayList<Bundle>();
- List<BundleInfoLite> uninstallListAll = new ArrayList<BundleInfoLite>();
+ Collection<Bundle> bundlesToRefresh = new ArrayList<>();
+ List<BundleInfoLite> uninstallListAll = new ArrayList<>();
for(BundleInfoLite info:bundles){
if(!info.isInstalled()){
List<BundleInfoLite> uninstallList = managedArea.getByBundleName(info.getSymbolicName());
diff --git a/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/internal/ManagedFolderArea.java b/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/internal/ManagedFolderArea.java
index cfa3fee6360..5e0c83ab5ea 100644
--- a/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/internal/ManagedFolderArea.java
+++ b/plugins/org.eclipse.osee.framework.ui.workspacebundleloader/src/org/eclipse/osee/framework/ui/workspacebundleloader/internal/ManagedFolderArea.java
@@ -66,7 +66,7 @@ public class ManagedFolderArea {
}
public List<BundleInfoLite> copyDeltasToManagedFolder(List<BundleInfoLite> copies) {
- List<BundleInfoLite> bundlesAdded = new ArrayList<BundleInfoLite>();
+ List<BundleInfoLite> bundlesAdded = new ArrayList<>();
for(BundleInfoLite info: copies){
File folder = new File(bundleLocationFolder, info.getSymbolicName());
folder.mkdirs();

Back to the top