X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FMainWindow.java;h=f582bb2fb35492c8b873b20697d0939fcdd05373;hb=99ef3764897825a3154cb662b2b81f51c16fdbd2;hp=9731ec5e94a386d0fdb9d3c72a9d6e4d82f4ee79;hpb=587428e890799ee0c6d3a3224e4a161a3480811d;p=jSite2.git diff --git a/src/net/pterodactylus/jsite/gui/MainWindow.java b/src/net/pterodactylus/jsite/gui/MainWindow.java index 9731ec5..f582bb2 100644 --- a/src/net/pterodactylus/jsite/gui/MainWindow.java +++ b/src/net/pterodactylus/jsite/gui/MainWindow.java @@ -264,11 +264,11 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop * @param project */ void projectInsertStarted(Project project) { - ProjectPanel projectPanel = findProjectPanel(project); - if (projectPanel == null) { + int projectIndex = getProjectIndex(project); + if (projectIndex == -1) { return; } - + projectPane.setTitleAt(projectIndex, I18n.get("projectPanel.title.starting", project.getName())); } /** @@ -281,14 +281,18 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop * @param finalizedTotal */ void projectInsertProgressed(Project project, int totalBlocks, int requiredBlocks, int successfulBlocks, int failedBlocks, int fatallyFailedBlocks, boolean finalizedTotal) { - + int projectIndex = getProjectIndex(project); + if (projectIndex == -1) { + return; + } + projectPane.setTitleAt(projectIndex, I18n.get("projectPanel.title.progress", project.getName(), requiredBlocks / (double) successfulBlocks)); } /** * @param project */ void projectInsertGeneratedURI(Project project) { - + /* TODO - update panel. */ } /** @@ -296,7 +300,11 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop * @param success */ void projectInsertFinished(Project project, boolean success) { - + int projectIndex = getProjectIndex(project); + if (projectIndex == -1) { + return; + } + projectPane.setTitleAt(projectIndex, project.getName()); } // @@ -304,22 +312,24 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop // /** - * Locates the project panel that contains the given project. + * Returns the index of the project panel that contains the given project. * * @param project * The wanted project + * @return The index of {@link #projectPane}’s tab that contains the given + * project, or -1 if the project can not be found */ - private ProjectPanel findProjectPanel(Project project) { + private int getProjectIndex(Project project) { int tabCount = projectPane.getTabCount(); for (int tabIndex = 1; tabIndex < tabCount; tabIndex++) { Component tabComponent = projectPane.getComponentAt(tabIndex); if (tabComponent instanceof ProjectPanel) { if (((ProjectPanel) tabComponent).getProject() == project) { - return (ProjectPanel) tabComponent; + return tabIndex; } } } - return null; + return -1; } /**