Skip to content

Commit cb55392

Browse files
author
emmanue1
committed
Update tooltip on tabs
1 parent cb8de55 commit cb55392

26 files changed

+103
-66
lines changed

‎services/src/main/java/org/jd/gui/service/treenode/ClassFileTreeNodeFactoryProvider.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public class ClassFileTreeNodeFactoryProvider extends AbstractTypeFileTreeNodeFa
4141
@SuppressWarnings("unchecked")
4242
public <T extends DefaultMutableTreeNode & ContainerEntryGettable & UriGettable> T make(API api, Container.Entry entry) {
4343
int lastSlashIndex = entry.getPath().lastIndexOf('/');
44-
String name = entry.getPath().substring(lastSlashIndex+1);
45-
return (T)new FileTreeNode(entry, new TreeNodeBean(name, CLASS_FILE_ICON), FACTORY);
44+
String label = entry.getPath().substring(lastSlashIndex+1);
45+
return (T)new FileTreeNode(entry, new TreeNodeBean(label, CLASS_FILE_ICON), FACTORY);
4646
}
4747

4848
protected static class Factory implements AbstractTypeFileTreeNodeFactoryProvider.PageAndTipFactory {
@@ -54,10 +54,10 @@ public <T extends JComponent & UriGettable> T makePage(API a, Container.Entry e)
5454

5555
@Override
5656
public String makeTip(API api, Container.Entry entry) {
57-
File file = new File(entry.getContainer().getRoot().getUri());
57+
String location = new File(entry.getUri()).getPath();
5858
StringBuilder tip = new StringBuilder("<html>Location: ");
5959

60-
tip.append(file.getPath());
60+
tip.append(location);
6161
tip.append("<br>Java compiler version: ");
6262

6363
try (InputStream is = entry.getInputStream()) {

‎services/src/main/java/org/jd/gui/service/treenode/CssFileTreeNodeFactoryProvider.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import javax.swing.*;
1818
import javax.swing.tree.DefaultMutableTreeNode;
19+
import java.io.File;
1920

2021
public class CssFileTreeNodeFactoryProvider extends TextFileTreeNodeFactoryProvider {
2122
protected static final ImageIcon ICON = new ImageIcon(HtmlFileTreeNodeFactoryProvider.class.getClassLoader().getResource("org/jd/gui/images/css_obj.png"));
@@ -26,8 +27,9 @@ public class CssFileTreeNodeFactoryProvider extends TextFileTreeNodeFactoryProvi
2627
@SuppressWarnings("unchecked")
2728
public <T extends DefaultMutableTreeNode & ContainerEntryGettable & UriGettable> T make(API api, Container.Entry entry) {
2829
int lastSlashIndex = entry.getPath().lastIndexOf("/");
29-
String name = entry.getPath().substring(lastSlashIndex+1);
30-
return (T)new TreeNode(entry, new TreeNodeBean(name, "Location: " + entry.getUri().getPath(), ICON));
30+
String label = entry.getPath().substring(lastSlashIndex+1);
31+
String location = new File(entry.getUri()).getPath();
32+
return (T)new TreeNode(entry, new TreeNodeBean(label, "Location: " + location, ICON));
3133
}
3234

3335
protected static class TreeNode extends TextFileTreeNodeFactoryProvider.TreeNode {

‎services/src/main/java/org/jd/gui/service/treenode/DirectoryTreeNodeFactoryProvider.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import javax.swing.*;
2020
import javax.swing.tree.DefaultMutableTreeNode;
21+
import java.io.File;
2122
import java.net.URI;
2223
import java.util.Collection;
2324

@@ -42,15 +43,16 @@ public <T extends DefaultMutableTreeNode & ContainerEntryGettable & UriGettable>
4243
}
4344

4445
String label = entry.getPath().substring(lastSlashIndex+1);
45-
TreeNode node = new TreeNode(entry, new TreeNodeBean(label, getIcon(), getOpenIcon()));
46+
String location = new File(entry.getUri()).getPath();
47+
TreeNode node = new TreeNode(entry, new TreeNodeBean(label, "Location: " + location, getIcon(), getOpenIcon()));
4648

4749
if (entries.size() > 0) {
4850
// Add dummy node
4951
node.add(new DefaultMutableTreeNode());
5052
}
5153

52-
return (T)node;
53-
}
54+
return (T)node;
55+
}
5456

5557
public ImageIcon getIcon() { return ICON; }
5658
public ImageIcon getOpenIcon() { return OPEN_ICON; }

‎services/src/main/java/org/jd/gui/service/treenode/DtdFileTreeNodeFactoryProvider.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import javax.swing.*;
1818
import javax.swing.tree.DefaultMutableTreeNode;
19+
import java.io.File;
1920

2021
public class DtdFileTreeNodeFactoryProvider extends TextFileTreeNodeFactoryProvider {
2122
protected static final ImageIcon ICON = new ImageIcon(DtdFileTreeNodeFactoryProvider.class.getClassLoader().getResource("org/jd/gui/images/dtd_obj.gif"));
@@ -26,8 +27,9 @@ public class DtdFileTreeNodeFactoryProvider extends TextFileTreeNodeFactoryProvi
2627
@SuppressWarnings("unchecked")
2728
public <T extends DefaultMutableTreeNode & ContainerEntryGettable & UriGettable> T make(API api, Container.Entry entry) {
2829
int lastSlashIndex = entry.getPath().lastIndexOf("/");
29-
String name = entry.getPath().substring(lastSlashIndex+1);
30-
return (T)new TreeNode(entry, new TreeNodeBean(name, "Location: " + entry.getUri().getPath(), ICON));
30+
String label = entry.getPath().substring(lastSlashIndex+1);
31+
String location = new File(entry.getUri()).getPath();
32+
return (T)new TreeNode(entry, new TreeNodeBean(label, "Location: " + location, ICON));
3133
}
3234

3335
protected static class TreeNode extends TextFileTreeNodeFactoryProvider.TreeNode {

‎services/src/main/java/org/jd/gui/service/treenode/EarFileTreeNodeFactoryProvider.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import javax.swing.*;
1717
import javax.swing.tree.DefaultMutableTreeNode;
18+
import java.io.File;
1819

1920
public class EarFileTreeNodeFactoryProvider extends ZipFileTreeNodeFactoryProvider {
2021
protected static final ImageIcon ICON = new ImageIcon(JarFileTreeNodeFactoryProvider.class.getClassLoader().getResource("org/jd/gui/images/ear_obj.gif"));
@@ -25,8 +26,9 @@ public class EarFileTreeNodeFactoryProvider extends ZipFileTreeNodeFactoryProvid
2526
@SuppressWarnings("unchecked")
2627
public <T extends DefaultMutableTreeNode & ContainerEntryGettable & UriGettable> T make(API api, Container.Entry entry) {
2728
int lastSlashIndex = entry.getPath().lastIndexOf("/");
28-
String name = entry.getPath().substring(lastSlashIndex+1);
29-
T node = (T)new TreeNode(entry, "ear", new TreeNodeBean(name, ICON));
29+
String label = entry.getPath().substring(lastSlashIndex+1);
30+
String location = new File(entry.getUri()).getPath();
31+
T node = (T)new TreeNode(entry, "ear", new TreeNodeBean(label, "Location: " + location, ICON));
3032
// Add dummy node
3133
node.add(new DefaultMutableTreeNode());
3234
return node;

‎services/src/main/java/org/jd/gui/service/treenode/EjbJarXmlFileTreeNodeFactoryProvider.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import javax.swing.*;
1919
import javax.swing.tree.DefaultMutableTreeNode;
20+
import java.io.File;
2021

2122
public class EjbJarXmlFileTreeNodeFactoryProvider extends FileTreeNodeFactoryProvider {
2223
protected static final ImageIcon ICON = new ImageIcon(ManifestFileTreeNodeFactoryProvider.class.getClassLoader().getResource("org/jd/gui/images/xml_obj.gif"));
@@ -26,7 +27,8 @@ public class EjbJarXmlFileTreeNodeFactoryProvider extends FileTreeNodeFactoryPro
2627
@Override
2728
@SuppressWarnings("unchecked")
2829
public <T extends DefaultMutableTreeNode & ContainerEntryGettable & UriGettable> T make(API api, Container.Entry entry) {
29-
return (T)new TreeNode(entry, new TreeNodeBean("ejb-jar.xml", "Location: " + entry.getUri().getPath(), ICON));
30+
String location = new File(entry.getUri()).getPath();
31+
return (T)new TreeNode(entry, new TreeNodeBean("ejb-jar.xml", "Location: " + location, ICON));
3032
}
3133

3234
protected static class TreeNode extends FileTreeNodeFactoryProvider.TreeNode implements PageCreator {

‎services/src/main/java/org/jd/gui/service/treenode/FileTreeNodeFactoryProvider.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,22 @@
1515

1616
import javax.swing.*;
1717
import javax.swing.tree.DefaultMutableTreeNode;
18+
import java.io.File;
1819
import java.net.URI;
1920

2021
public class FileTreeNodeFactoryProvider extends AbstractTreeNodeFactoryProvider {
21-
protected static final ImageIcon ICON = new ImageIcon(FileTreeNodeFactoryProvider.class.getClassLoader().getResource("org/jd/gui/images/file_plain_obj.png"));
22+
protected static final ImageIcon ICON = new ImageIcon(FileTreeNodeFactoryProvider.class.getClassLoader().getResource("org/jd/gui/images/file_plain_obj.png"));
2223

2324
@Override public String[] getSelectors() { return appendSelectors("*:file:*"); }
2425

2526
@Override
2627
@SuppressWarnings("unchecked")
2728
public <T extends DefaultMutableTreeNode & ContainerEntryGettable & UriGettable> T make(API api, Container.Entry entry) {
2829
int lastSlashIndex = entry.getPath().lastIndexOf('/');
29-
String name = entry.getPath().substring(lastSlashIndex+1);
30-
return (T)new TreeNode(entry, new TreeNodeBean(name, ICON));
31-
}
30+
String label = entry.getPath().substring(lastSlashIndex+1);
31+
String location = new File(entry.getUri()).getPath();
32+
return (T)new TreeNode(entry, new TreeNodeBean(label, "Location: " + location, ICON));
33+
}
3234

3335
protected static class TreeNode extends DefaultMutableTreeNode implements ContainerEntryGettable, UriGettable {
3436
protected Container.Entry entry;

‎services/src/main/java/org/jd/gui/service/treenode/HtmlFileTreeNodeFactoryProvider.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import javax.swing.*;
1818
import javax.swing.tree.DefaultMutableTreeNode;
19+
import java.io.File;
1920

2021
public class HtmlFileTreeNodeFactoryProvider extends TextFileTreeNodeFactoryProvider {
2122
protected static final ImageIcon ICON = new ImageIcon(HtmlFileTreeNodeFactoryProvider.class.getClassLoader().getResource("org/jd/gui/images/html_obj.gif"));
@@ -26,8 +27,9 @@ public class HtmlFileTreeNodeFactoryProvider extends TextFileTreeNodeFactoryProv
2627
@SuppressWarnings("unchecked")
2728
public <T extends DefaultMutableTreeNode & ContainerEntryGettable & UriGettable> T make(API api, Container.Entry entry) {
2829
int lastSlashIndex = entry.getPath().lastIndexOf("/");
29-
String name = entry.getPath().substring(lastSlashIndex+1);
30-
return (T)new TreeNode(entry, new TreeNodeBean(name, "Location: " + entry.getUri().getPath(), ICON));
30+
String label = entry.getPath().substring(lastSlashIndex+1);
31+
String location = new File(entry.getUri()).getPath();
32+
return (T)new TreeNode(entry, new TreeNodeBean(label, "Location: " + location, ICON));
3133
}
3234

3335
protected static class TreeNode extends TextFileTreeNodeFactoryProvider.TreeNode {

‎services/src/main/java/org/jd/gui/service/treenode/ImageFileTreeNodeFactoryProvider.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import javax.swing.*;
1818
import javax.swing.tree.DefaultMutableTreeNode;
1919
import java.awt.*;
20+
import java.io.File;
2021
import java.io.IOException;
2122
import java.io.InputStream;
2223
import java.net.URI;
@@ -30,8 +31,9 @@ public class ImageFileTreeNodeFactoryProvider extends FileTreeNodeFactoryProvide
3031
@SuppressWarnings("unchecked")
3132
public <T extends DefaultMutableTreeNode & ContainerEntryGettable & UriGettable> T make(API api, Container.Entry entry) {
3233
int lastSlashIndex = entry.getPath().lastIndexOf("/");
33-
String name = entry.getPath().substring(lastSlashIndex+1);
34-
return (T)new TreeNode(entry, new TreeNodeBean(name, "Location: " + entry.getUri().getPath(), ICON));
34+
String label = entry.getPath().substring(lastSlashIndex+1);
35+
String location = new File(entry.getUri()).getPath();
36+
return (T)new TreeNode(entry, new TreeNodeBean(label, "Location: " + location, ICON));
3537
}
3638

3739
protected static class TreeNode extends FileTreeNodeFactoryProvider.TreeNode implements PageCreator {

‎services/src/main/java/org/jd/gui/service/treenode/JarFileTreeNodeFactoryProvider.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import javax.swing.*;
1818
import javax.swing.tree.DefaultMutableTreeNode;
19+
import java.io.File;
1920
import java.util.Collection;
2021

2122
public class JarFileTreeNodeFactoryProvider extends ZipFileTreeNodeFactoryProvider {
@@ -28,13 +29,14 @@ public class JarFileTreeNodeFactoryProvider extends ZipFileTreeNodeFactoryProvid
2829
@SuppressWarnings("unchecked")
2930
public <T extends DefaultMutableTreeNode & ContainerEntryGettable & UriGettable> T make(API api, Container.Entry entry) {
3031
int lastSlashIndex = entry.getPath().lastIndexOf("/");
31-
String name = entry.getPath().substring(lastSlashIndex+1);
32+
String label = entry.getPath().substring(lastSlashIndex+1);
33+
String location = new File(entry.getUri()).getPath();
3234
ImageIcon icon = isAEjbModule(entry) ? EJB_FILE_ICON : JAR_FILE_ICON;
33-
T node = (T)new TreeNode(entry, "jar", new TreeNodeBean(name, icon));
35+
T node = (T)new TreeNode(entry, "jar", new TreeNodeBean(label, "Location: " + location, icon));
3436
// Add dummy node
3537
node.add(new DefaultMutableTreeNode());
3638
return node;
37-
}
39+
}
3840

3941
protected static boolean isAEjbModule(Container.Entry entry) {
4042
Collection<Container.Entry> children = entry.getChildren();

0 commit comments

Comments
 (0)