Cynosphere/bcv-vf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resolves #235

Browse source
This commit is contained in:
Konloch 2021-06-29 04:12:49 -07:00
parent a2c79f2a81
commit e1d2196977
4 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/WorkPaneMainComponent.java
View file

@ -158,9 +158,7 @@ public class WorkPaneMainComponent extends VisibleComponent
//load class resources //load class resources
public void addClassResource(final FileContainer container, final String name, final ClassNode cn) public void addClassResource(final FileContainer container, final String name, final ClassNode cn)
{ {
final String workingName = container.name + ">" + name; addResource(container, name, new ClassViewer(container, name, cn));
addResource(container, name, new ClassViewer(container, name, cn, workingName));
} }
//Load file resources //Load file resources
@ -169,14 +167,12 @@ public class WorkPaneMainComponent extends VisibleComponent
if (contents == null) //a directory if (contents == null) //a directory
return; return;
final String workingName = container.name + ">" + name; addResource(container, name, new FileViewer(container, name, contents));
addResource(container, name, new FileViewer(container, name, contents, workingName));
} }
private void addResource(final FileContainer container, final String name, final ResourceViewer resourceView) private void addResource(final FileContainer container, final String name, final ResourceViewer resourceView)
{ {
final String workingName = container.name + ">" + name; final String workingName = container.generateWorkName(name);
//create a new tab if the resource isn't opened currently //create a new tab if the resource isn't opened currently
if (!openedTabs.contains(workingName)) if (!openedTabs.contains(workingName))

4
src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/viewer/ClassViewer.java
View file

@ -69,9 +69,9 @@ public class ClassViewer extends ResourceViewer
public List<MethodParser> methods = Arrays.asList(new MethodParser(), new MethodParser(), new MethodParser()); public List<MethodParser> methods = Arrays.asList(new MethodParser(), new MethodParser(), new MethodParser());
public final String workingName; public final String workingName;
public ClassViewer(final FileContainer container, final String name, final ClassNode cn, String workingName) public ClassViewer(final FileContainer container, final String name, final ClassNode cn)
{ {
this.workingName = workingName; this.workingName = container.generateWorkName(name);
this.container = container; this.container = container;
this.name = name; this.name = name;

4
src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/viewer/FileViewer.java
View file

@ -61,11 +61,11 @@ public class FileViewer extends ResourceViewer
public BufferedImage image; public BufferedImage image;
public boolean canRefresh; public boolean canRefresh;
public FileViewer(final FileContainer container, final String name, final byte[] contents, String workingName) public FileViewer(final FileContainer container, final String name, final byte[] contents)
{ {
this.name = name; this.name = name;
this.contents = contents; this.contents = contents;
this.workingName = workingName; this.workingName = container.generateWorkName(name);
this.container = container; this.container = container;
this.setName(name); this.setName(name);
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());

5
src/main/java/the/bytecode/club/bytecodeviewer/util/FileContainer.java
View file

@ -57,4 +57,9 @@ public class FileContainer {
return null; return null;
} }
public String generateWorkName(String name)
{
return file.getAbsolutePath() + ">" + name;
}
} }