Updates API

azthief · Jun 14, 2015 · 411348d · 411348d
1 parent dc7e03e
commit 411348d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/api/src/main/java/jd/gui/api/model/Type.java b/api/src/main/java/jd/gui/api/model/Type.java
@@ -24,8 +24,6 @@ public interface Type {
 
     public String getName();
 
-    public String getShortName();
-
     public String getSuperName();
 
     public String getOuterName();

diff --git a/api/src/main/java/jd/gui/spi/TypeFactory.java b/api/src/main/java/jd/gui/spi/TypeFactory.java
@@ -9,12 +9,23 @@
 import jd.gui.api.model.Container;
 import jd.gui.api.model.Type;
 
+import java.util.Collection;
 import java.util.regex.Pattern;
 
 public interface TypeFactory {
 	public String[] getSelectors();
 
     public Pattern getPathPattern();
 
+	/**
+	 * @return all root types contains in 'entry'
+	 */
+	public Collection<Type> make(API api, Container.Entry entry);
+
+	/**
+     * @param fragment @see jd.gui.api.feature.UriOpenable
+	 * @return if 'fragment' is null, return the main type in 'entry',
+	 *         otherwise, return the type or sub-type matching with 'fragment'
+	 */
 	public Type make(API api, Container.Entry entry, String fragment);
 }
diff --git a/app/src/main/groovy/jd/gui/util/UriUtil.groovy b/app/src/main/groovy/jd/gui/util/UriUtil.groovy
@@ -18,7 +18,7 @@ class UriUtil {
      *  file://codebase/a/b/c/D$E.class => file://codebase/a/b/c/D.class#typeDeclaration=D$E
      */
     static URI createURI(API api, Collection<Indexes> collectionOfIndexes, Container.Entry entry, String query, String fragment) {
-        def type = TypeFactoryService.instance.get(entry)?.make(api, entry, null)
+        def type = TypeFactoryService.instance.get(entry)?.make(api, entry, fragment)
         def uri = entry.uri
         def path = type?.outerName ? getOuterPath(collectionOfIndexes, entry, type) : uri.path
         return new URI(uri.scheme, uri.host, path, query, fragment)