diff options
Diffstat (limited to 'debian/patches/allow-empty-packages.patch')
-rw-r--r-- | debian/patches/allow-empty-packages.patch | 111 |
1 files changed, 111 insertions, 0 deletions
diff --git a/debian/patches/allow-empty-packages.patch b/debian/patches/allow-empty-packages.patch new file mode 100644 index 00000000..63c0b635 --- /dev/null +++ b/debian/patches/allow-empty-packages.patch @@ -0,0 +1,111 @@ +From b2440d8b20318ba332250443193f8d46fa6ca523 Mon Sep 17 00:00:00 2001 +From: Erich Schubert <schube@dbs.ifi.lmu.de> +Date: Fri, 27 Nov 2015 15:10:31 +0100 +Subject: [PATCH] Robustness: allow default package for user extensions. + +--- + .../de/lmu/ifi/dbs/elki/gui/util/ClassTree.java | 27 +++++++++++----------- + 1 file changed, 14 insertions(+), 13 deletions(-) + +Index: elki-0.7.0/elki/src/main/java/de/lmu/ifi/dbs/elki/gui/util/ClassTree.java +=================================================================== +--- elki-0.7.0.orig/elki/src/main/java/de/lmu/ifi/dbs/elki/gui/util/ClassTree.java ++++ elki-0.7.0/elki/src/main/java/de/lmu/ifi/dbs/elki/gui/util/ClassTree.java +@@ -31,15 +31,15 @@ import javax.swing.tree.TreeNode; + + /** + * Build a tree of available classes for use in Swing UIs. +- * ++ * + * @author Erich Schubert +- * ++ * + * @apiviz.has TreeNode + */ + public class ClassTree { + /** + * Build the class tree for a given set of choices. +- * ++ * + * @param choices Class choices + * @param rootpkg Root package name (to strip / hide) + * @return Root node. +@@ -59,7 +59,8 @@ public class ClassTree { + for(Class<?> impl : choices) { + String name = impl.getName(); + name = (prefix != null && name.startsWith(prefix)) ? name.substring(prefix.length()) : name; +- MutableTreeNode c = new ClassNode(impl.getName().substring(impl.getPackage().getName().length() + 1), name); ++ int plen = (impl.getPackage() != null) ? impl.getPackage().getName().length() + 1 : 0; ++ MutableTreeNode c = new ClassNode(impl.getName().substring(plen), name); + + MutableTreeNode p = null; + int l = name.lastIndexOf('.'); +@@ -96,7 +97,7 @@ public class ClassTree { + + /** + * Simplify the tree. +- * ++ * + * @param cur Current node + * @param prefix Prefix to add + * @return Replacement node +@@ -133,9 +134,9 @@ public class ClassTree { + + /** + * Tree node representing a single class. +- * ++ * + * @author Erich Schubert +- * ++ * + * @apiviz.exclude + */ + public static class PackageNode extends DefaultMutableTreeNode { +@@ -151,7 +152,7 @@ public class ClassTree { + + /** + * Current class name. +- * ++ * + * @param display Displayed name + * @param pkgname Actual class name + */ +@@ -162,7 +163,7 @@ public class ClassTree { + + /** + * Return the package name. +- * ++ * + * @return Package name + */ + public String getPackageName() { +@@ -172,9 +173,9 @@ public class ClassTree { + + /** + * Tree node representing a single class. +- * ++ * + * @author Erich Schubert +- * ++ * + * @apiviz.exclude + */ + public static class ClassNode extends DefaultMutableTreeNode { +@@ -190,7 +191,7 @@ public class ClassTree { + + /** + * Current class name. +- * ++ * + * @param display Displayed name + * @param clsname Actual class name + */ +@@ -201,7 +202,7 @@ public class ClassTree { + + /** + * Return the class name. +- * ++ * + * @return Class name + */ + public String getClassName() { |