Import Debian changes 0.6.0~beta2-1

elki (0.6.0~beta2-1) unstable; urgency=low

  * New upstream beta release.
  * 3DPC extension is not yet included.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/database/AbstractDatabase.java b/src/de/lmu/ifi/dbs/elki/database/AbstractDatabase.java
index b62db142..8b3a64eb 100644
--- a/src/de/lmu/ifi/dbs/elki/database/AbstractDatabase.java
+++ b/src/de/lmu/ifi/dbs/elki/database/AbstractDatabase.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.database;
  This file is part of ELKI:
  Environment for Developing KDD-Applications Supported by Index-Structures
 
- Copyright (C) 2012
+ Copyright (C) 2013
  Ludwig-Maximilians-Universität München
  Lehr- und Forschungseinheit für Datenbanksysteme
  ELKI Development Team
@@ -82,17 +82,17 @@ public abstract class AbstractDatabase extends AbstractHierarchicalResult implem
   /**
    * The relations we manage.
    */
-  protected final List<Relation<?>> relations = new java.util.Vector<Relation<?>>();
+  protected final List<Relation<?>> relations = new ArrayList<>();
 
   /**
    * Indexes.
    */
-  protected final List<Index> indexes = new java.util.Vector<Index>();
+  protected final List<Index> indexes = new ArrayList<>();
 
   /**
    * Index factories.
    */
-  protected final Collection<IndexFactory<?, ?>> indexFactories = new java.util.Vector<IndexFactory<?, ?>>();
+  protected final Collection<IndexFactory<?, ?>> indexFactories = new ArrayList<>();
 
   /**
    * Constructor.
@@ -154,7 +154,7 @@ public abstract class AbstractDatabase extends AbstractHierarchicalResult implem
         return (Relation<O>) relation;
       }
     }
-    List<TypeInformation> types = new ArrayList<TypeInformation>(relations.size());
+    List<TypeInformation> types = new ArrayList<>(relations.size());
     for(Relation<?> relation : relations) {
       types.add(relation.getDataTypeInformation());
     }
@@ -269,7 +269,7 @@ public abstract class AbstractDatabase extends AbstractHierarchicalResult implem
       }
     }
     KNNQuery<O, D> knnQuery = getKNNQuery(distanceQuery, DatabaseQuery.HINT_BULK, maxk);
-    return new LinearScanRKNNQuery<O, D>(distanceQuery, knnQuery, maxk);
+    return new LinearScanRKNNQuery<>(distanceQuery, knnQuery, maxk);
   }
 
   @Override