fix fragment markup loading #1

diff --git a/src/main/java/com/gitblit/wicket/pages/ActivityPage.java b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
index f7c8ccf17f7acee2d2de9b39a9f28afc07d9d272..82e64c150d70b527082a5a9431f340b911e400ee 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
@@ -118,7 +118,7 @@ public class ActivityPage extends RootPage {
                        if (app().settings().getBoolean(Keys.web.generateActivityGraph, true)) {\r
                                Charts charts = createCharts(recentActivity);\r
                                add(charts);\r
-                               add(new Fragment("chartsPanel", "chartsFragment", this));\r
+                               add(new Fragment("chartsPanel", "chartsFragment", ActivityPage.this));\r
                        } else {\r
                                add(new Label("chartsPanel").setVisible(false));\r
                        }\r

diff --git a/src/main/java/com/gitblit/wicket/pages/ComparePage.java b/src/main/java/com/gitblit/wicket/pages/ComparePage.java
index bbf866c04d79f4601c8ed0400af8fe27a7b3112b..98c5abc8e83f94ede1d36bf5773956856d250737 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/ComparePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ComparePage.java
@@ -84,7 +84,7 @@ public class ComparePage extends RepositoryPage {
                        add(new Label("comparison").setVisible(false));
                } else {
                        // active comparison
-                       Fragment comparison = new Fragment("comparison", "comparisonFragment", this);
+                       Fragment comparison = new Fragment("comparison", "comparisonFragment", ComparePage.this);
                        add(comparison);
 
                        RevCommit fromCommit;

diff --git a/src/main/java/com/gitblit/wicket/pages/DashboardPage.java b/src/main/java/com/gitblit/wicket/pages/DashboardPage.java
index 0b2473342f376ad7a225e8369943eb9da890c26f..51a73f95856d6b245d1b862ed4c2e3faa869222e 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/DashboardPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/DashboardPage.java
@@ -88,7 +88,7 @@ public abstract class DashboardPage extends RootPage {
                        }\r
                }\r
 \r
-               Fragment activityFragment = new Fragment("activity", "activityFragment", this);\r
+               Fragment activityFragment = new Fragment("activity", "activityFragment", DashboardPage.this);\r
                add(activityFragment);\r
                activityFragment.add(new Label("feedTitle", feedTitle));\r
                if (digests.size() == 0) {\r
@@ -240,7 +240,7 @@ public abstract class DashboardPage extends RootPage {
                        charts.addChart(chart);\r
 \r
                        add(charts);\r
-                       frag.add(new Fragment("charts", "chartsFragment", this));\r
+                       frag.add(new Fragment("charts", "chartsFragment", DashboardPage.this));\r
                } else {\r
                        frag.add(new Label("charts").setVisible(false));\r
                }\r

diff --git a/src/main/java/com/gitblit/wicket/pages/DocPage.java b/src/main/java/com/gitblit/wicket/pages/DocPage.java
index 0ff50a859a8ddb9e0d1d6ac3f1b6072b5a8b2347..5b365c464e9dc1402ce5321488c8771c5ebfa438 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/DocPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/DocPage.java
@@ -83,9 +83,9 @@ public class DocPage extends RepositoryPage {
                Fragment fragment;\r
                MarkupDocument markupDoc = processor.parse(repositoryName, getBestCommitId(commit), documentPath, markupText);\r
                if (MarkupSyntax.PLAIN.equals(markupDoc.syntax)) {\r
-                       fragment = new Fragment("doc", "plainContent", this);\r
+                       fragment = new Fragment("doc", "plainContent", DocPage.this);\r
                } else {\r
-                       fragment = new Fragment("doc", "markupContent", this);\r
+                       fragment = new Fragment("doc", "markupContent", DocPage.this);\r
                }\r
 \r
                // document page links\r

diff --git a/src/main/java/com/gitblit/wicket/pages/DocsPage.java b/src/main/java/com/gitblit/wicket/pages/DocsPage.java
index 0014445419ff5a1cd336bf67536b2a0b7216a3b0..2345b9076d95424eb273793d5340b9257cb710bb 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/DocsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/DocsPage.java
@@ -71,11 +71,11 @@ public class DocsPage extends RepositoryPage {
                Fragment fragment = null;\r
                if (roots.isEmpty()) {\r
                        // no identified root documents\r
-                       fragment = new Fragment("docs", "noIndexFragment", this);\r
+                       fragment = new Fragment("docs", "noIndexFragment", DocsPage.this);\r
                        setResponsePage(NoDocsPage.class, params);\r
                } else {\r
                        // root documents, use tabbed ui of index/root and document list\r
-                       fragment = new Fragment("docs", "tabsFragment", this);\r
+                       fragment = new Fragment("docs", "tabsFragment", DocsPage.this);\r
                        ListDataProvider<MarkupDocument> docDp = new ListDataProvider<MarkupDocument>(roots);\r
 \r
                        // tab titles\r
@@ -143,7 +143,7 @@ public class DocsPage extends RepositoryPage {
 \r
                // document list\r
                final ByteFormat byteFormat = new ByteFormat();\r
-               Fragment docs = new Fragment("documents", "documentsFragment", this);\r
+               Fragment docs = new Fragment("documents", "documentsFragment", DocsPage.this);\r
                ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths);\r
                DataView<PathModel> pathsView = new DataView<PathModel>("document", pathsDp) {\r
                        private static final long serialVersionUID = 1L;\r

diff --git a/src/main/java/com/gitblit/wicket/pages/EditFilePage.java b/src/main/java/com/gitblit/wicket/pages/EditFilePage.java
index bee642dfa2ebd8df9d7c43679920d567b8dfd20b..86d20d09e69ddaadb54dbb3c40fd2aaa2bdea910 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/EditFilePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditFilePage.java
@@ -103,7 +103,7 @@ public class EditFilePage extends RepositoryPage {
                        final Model<String> commitMessage = new Model<String>("Document update");
                        final Model<String> commitIdAtLoad = new Model<String>(displayedCommitId);
                        
-                       fragment = new Fragment("doc", "markupContent", this);
+                       fragment = new Fragment("doc", "markupContent", EditFilePage.this);
                        
                        Form<Void> form = new Form<Void>("documentEditor") {
                                
@@ -182,7 +182,7 @@ public class EditFilePage extends RepositoryPage {
                        MarkupDocument markupDoc = processor.parse(repositoryName, displayedCommitId, documentPath, markupText);
                        final Model<String> documentContent = new Model<String>(markupDoc.html);
                        
-                       fragment = new Fragment("doc", "plainContent", this);
+                       fragment = new Fragment("doc", "plainContent", EditFilePage.this);
                        
                        fragment.add(new Label("content", documentContent).setEscapeModelStrings(false));
                }

diff --git a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
index cacdc4ab053d0c103b4806e149287ef4ac17d756..8cc2c6113d98fb19505261be91af071958fef8e7 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
@@ -163,7 +163,7 @@ public class EditTicketPage extends RepositoryPage {
                } else {\r
                        statusChoices = Arrays.asList(TicketModel.Status.requestWorkflow);\r
                }\r
-               Fragment status = new Fragment("status", "statusFragment", this);\r
+               Fragment status = new Fragment("status", "statusFragment", EditTicketPage.this);\r
                status.add(new DropDownChoice<TicketModel.Status>("status", statusModel, statusChoices));\r
                form.add(status);\r
 \r
@@ -200,7 +200,7 @@ public class EditTicketPage extends RepositoryPage {
                        }\r
                        Collections.sort(responsibles);\r
                        responsibles.add(new TicketResponsible(NIL, "", ""));\r
-                       Fragment responsible = new Fragment("responsible", "responsibleFragment", this);\r
+                       Fragment responsible = new Fragment("responsible", "responsibleFragment", EditTicketPage.this);\r
                        responsible.add(new DropDownChoice<TicketResponsible>("responsible", responsibleModel, responsibles));\r
                        form.add(responsible.setVisible(!responsibles.isEmpty()));\r
 \r
@@ -224,12 +224,12 @@ public class EditTicketPage extends RepositoryPage {
                        }\r
 \r
                        // milestone\r
-                       Fragment milestone = new Fragment("milestone", "milestoneFragment", this);\r
+                       Fragment milestone = new Fragment("milestone", "milestoneFragment", EditTicketPage.this);\r
                        milestone.add(new DropDownChoice<TicketMilestone>("milestone", milestoneModel, milestones));\r
                        form.add(milestone.setVisible(!milestones.isEmpty()));\r
 \r
                        // priority\r
-                       Fragment priority = new Fragment("priority", "priorityFragment", this);\r
+                       Fragment priority = new Fragment("priority", "priorityFragment", EditTicketPage.this);\r
                        List<TicketModel.Priority> priorityChoices = Arrays.asList(TicketModel.Priority.choices());\r
                        priority.add(new DropDownChoice<TicketModel.Priority>("priority", priorityModel, priorityChoices));\r
                        form.add(priority);\r
@@ -245,7 +245,7 @@ public class EditTicketPage extends RepositoryPage {
                        branches.remove(Repository.shortenRefName(getRepositoryModel().mergeTo));\r
                        branches.add(0, Repository.shortenRefName(getRepositoryModel().mergeTo));\r
 \r
-                       Fragment mergeto = new Fragment("mergeto", "mergeToFragment", this);\r
+                       Fragment mergeto = new Fragment("mergeto", "mergeToFragment", EditTicketPage.this);\r
                        mergeto.add(new DropDownChoice<String>("mergeto", mergeToModel, branches));\r
                        form.add(mergeto.setVisible(!branches.isEmpty()));\r
                } else {\r

diff --git a/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java b/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java
index ee24b6a92131516238dc2889b9cd6466a38640c7..4f34e5da13ec5e3d462c1f423318005899fa96c4 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.java
@@ -159,9 +159,9 @@ public class MyDashboardPage extends DashboardPage {
 \r
                Fragment repositoryTabs;\r
                if (UserModel.ANONYMOUS.equals(user)) {\r
-                       repositoryTabs = new Fragment("repositoryTabs", "anonymousTabsFragment", this);\r
+                       repositoryTabs = new Fragment("repositoryTabs", "anonymousTabsFragment", MyDashboardPage.this);\r
                } else {\r
-                       repositoryTabs = new Fragment("repositoryTabs", "authenticatedTabsFragment", this);\r
+                       repositoryTabs = new Fragment("repositoryTabs", "authenticatedTabsFragment", MyDashboardPage.this);\r
                }\r
 \r
                add(repositoryTabs);\r

diff --git a/src/main/java/com/gitblit/wicket/pages/NewTicketPage.java b/src/main/java/com/gitblit/wicket/pages/NewTicketPage.java
index 5092e66fcbac2d3838a7eb77dbfc4bb85251917a..1fd5839d8df20121c0357d8542f09fda2f8e8af5 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/NewTicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/NewTicketPage.java
@@ -149,18 +149,18 @@ public class NewTicketPage extends RepositoryPage {
                                }\r
                        }\r
                        Collections.sort(responsibles);\r
-                       Fragment responsible = new Fragment("responsible", "responsibleFragment", this);\r
+                       Fragment responsible = new Fragment("responsible", "responsibleFragment", NewTicketPage.this);\r
                        responsible.add(new DropDownChoice<TicketResponsible>("responsible", responsibleModel, responsibles));\r
                        form.add(responsible.setVisible(!responsibles.isEmpty()));\r
 \r
                        // milestone\r
                        List<TicketMilestone> milestones = app().tickets().getMilestones(getRepositoryModel(), Status.Open);\r
-                       Fragment milestone = new Fragment("milestone", "milestoneFragment", this);\r
+                       Fragment milestone = new Fragment("milestone", "milestoneFragment", NewTicketPage.this);\r
                        milestone.add(new DropDownChoice<TicketMilestone>("milestone", milestoneModel, milestones));\r
                        form.add(milestone.setVisible(!milestones.isEmpty()));\r
 \r
                        // priority\r
-                       Fragment priority = new Fragment("priority", "priorityFragment", this);\r
+                       Fragment priority = new Fragment("priority", "priorityFragment", NewTicketPage.this);\r
                        priority.add(new DropDownChoice<TicketModel.Priority>("priority", priorityModel, Arrays.asList(TicketModel.Priority.choices())));\r
                        form.add(priority);\r
 \r
@@ -175,7 +175,7 @@ public class NewTicketPage extends RepositoryPage {
                        branches.remove(Repository.shortenRefName(getRepositoryModel().HEAD));\r
                        branches.add(0, Repository.shortenRefName(getRepositoryModel().HEAD));\r
 \r
-                       Fragment mergeto = new Fragment("mergeto", "mergeToFragment", this);\r
+                       Fragment mergeto = new Fragment("mergeto", "mergeToFragment", NewTicketPage.this);\r
                        mergeto.add(new DropDownChoice<String>("mergeto", mergeToModel, branches));\r
                        form.add(mergeto.setVisible(!branches.isEmpty()));\r
                } else {\r

diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index 504d83c14aa157b9218e87dd0bda5aa9b02c0f0d..00d75590ab08f2f343eddb80e141f560c8f87ae7 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
@@ -305,16 +305,16 @@ public abstract class RepositoryPage extends RootPage {
                RepositoryModel model = getRepositoryModel();\r
                if (StringUtils.isEmpty(model.originRepository)) {\r
                        if (model.isMirror) {\r
-                               add(new Fragment("repoIcon", "mirrorIconFragment", this));\r
-                               Fragment mirrorFrag = new Fragment("originRepository", "mirrorFragment", this);\r
+                               add(new Fragment("repoIcon", "mirrorIconFragment", RepositoryPage.this));\r
+                               Fragment mirrorFrag = new Fragment("originRepository", "mirrorFragment", RepositoryPage.this);\r
                                Label lbl = new Label("originRepository", MessageFormat.format(getString("gb.mirrorOf"), "<b>" + model.origin + "</b>"));\r
                                mirrorFrag.add(lbl.setEscapeModelStrings(false));\r
                                add(mirrorFrag);\r
                        } else {\r
                                if (model.isBare) {\r
-                                       add(new Fragment("repoIcon", "repoIconFragment", this));\r
+                                       add(new Fragment("repoIcon", "repoIconFragment", RepositoryPage.this));\r
                                } else {\r
-                                       add(new Fragment("repoIcon", "cloneIconFragment", this));\r
+                                       add(new Fragment("repoIcon", "cloneIconFragment", RepositoryPage.this));\r
                                }\r
                                add(new Label("originRepository", Optional.of(model.description).or("")));\r
                        }\r
@@ -323,21 +323,21 @@ public abstract class RepositoryPage extends RootPage {
                        if (origin == null) {\r
                                // no origin repository, show description if available\r
                                if (model.isBare) {\r
-                                       add(new Fragment("repoIcon", "repoIconFragment", this));\r
+                                       add(new Fragment("repoIcon", "repoIconFragment", RepositoryPage.this));\r
                                } else {\r
-                                       add(new Fragment("repoIcon", "cloneIconFragment", this));\r
+                                       add(new Fragment("repoIcon", "cloneIconFragment", RepositoryPage.this));\r
                                }\r
                                add(new Label("originRepository", Optional.of(model.description).or("")));\r
                        } else if (!user.canView(origin)) {\r
                                // show origin repository without link\r
-                               add(new Fragment("repoIcon", "forkIconFragment", this));\r
-                               Fragment forkFrag = new Fragment("originRepository", "originFragment", this);\r
+                               add(new Fragment("repoIcon", "forkIconFragment", RepositoryPage.this));\r
+                               Fragment forkFrag = new Fragment("originRepository", "originFragment", RepositoryPage.this);\r
                                forkFrag.add(new Label("originRepository", StringUtils.stripDotGit(model.originRepository)));\r
                                add(forkFrag);\r
                        } else {\r
                                // link to origin repository\r
-                               add(new Fragment("repoIcon", "forkIconFragment", this));\r
-                               Fragment forkFrag = new Fragment("originRepository", "originFragment", this);\r
+                               add(new Fragment("repoIcon", "forkIconFragment", RepositoryPage.this));\r
+                               Fragment forkFrag = new Fragment("originRepository", "originFragment", RepositoryPage.this);\r
                                forkFrag.add(new LinkPanel("originRepository", null, StringUtils.stripDotGit(model.originRepository),\r
                                                SummaryPage.class, WicketUtils.newRepositoryParameter(model.originRepository)));\r
                                add(forkFrag);\r
@@ -415,7 +415,7 @@ public abstract class RepositoryPage extends RootPage {
        }\r
 \r
        protected void addToolbarButton(String wicketId, String iconClass, String label, String url) {\r
-               Fragment button = new Fragment(wicketId, "toolbarLinkFragment", this);\r
+               Fragment button = new Fragment(wicketId, "toolbarLinkFragment", RepositoryPage.this);\r
                Label icon = new Label("icon");\r
                WicketUtils.setCssClass(icon, iconClass);\r
                button.add(icon);\r
@@ -621,14 +621,14 @@ public abstract class RepositoryPage extends RootPage {
                                        value = getString("gb.missingUsername");\r
                                }\r
                        }\r
-                       Fragment partial = new Fragment(wicketId, "partialPersonIdent", this);\r
+                       Fragment partial = new Fragment(wicketId, "partialPersonIdent", RepositoryPage.this);\r
                        LinkPanel link = new LinkPanel("personName", "list", value, GitSearchPage.class,\r
                                        WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType));\r
                        setPersonSearchTooltip(link, value, searchType);\r
                        partial.add(link);\r
                        return partial;\r
                } else {\r
-                       Fragment fullPerson = new Fragment(wicketId, "fullPersonIdent", this);\r
+                       Fragment fullPerson = new Fragment(wicketId, "fullPersonIdent", RepositoryPage.this);\r
                        LinkPanel nameLink = new LinkPanel("personName", "list", name, GitSearchPage.class,\r
                                        WicketUtils.newSearchParameter(repositoryName, objectId, name, searchType));\r
                        setPersonSearchTooltip(nameLink, name, searchType);\r

diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java
index 455dd417a353a118c0bdc084ba50708756e5f475..0d802816cbdc9efa8c40ffdaff977d967f5e034c 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/RootPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java
@@ -692,7 +692,7 @@ public abstract class RootPage extends BasePage {
                 * @return a submenu fragment
                 */
                private Fragment newSubmenu(String wicketId, String submenuTitle, List<MenuItem> menuItems) {
-                       Fragment submenu = new Fragment(wicketId, "submenuFragment", this);
+                       Fragment submenu = new Fragment(wicketId, "submenuFragment", RootPage.this);
                        submenu.add(new Label("submenuTitle", submenuTitle).setRenderBodyOnly(true));
                        ListDataProvider<MenuItem> menuItemsDp = new ListDataProvider<MenuItem>(menuItems);
                        DataView<MenuItem> submenuItems = new DataView<MenuItem>("submenuItem", menuItemsDp) {

diff --git a/src/main/java/com/gitblit/wicket/pages/SummaryPage.java b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java
index 43f9c450ec1a41e92776758bff29b261a305bd2f..485f4d0aa1afde00ca8ce22196756219189513ca 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java
@@ -143,7 +143,7 @@ public class SummaryPage extends RepositoryPage {
                        if (markupDoc == null || markupDoc.markup == null) {\r
                                add(new Label("readme").setVisible(false));\r
                        } else {\r
-                               Fragment fragment = new Fragment("readme", MarkupSyntax.PLAIN.equals(markupDoc.syntax) ? "plaintextPanel" : "markdownPanel", this);\r
+                               Fragment fragment = new Fragment("readme", MarkupSyntax.PLAIN.equals(markupDoc.syntax) ? "plaintextPanel" : "markdownPanel", SummaryPage.this);\r
                                fragment.add(new Label("readmeFile", markupDoc.documentPath));\r
                                // Add the html to the page\r
                                Component content = new Label("readmeContent", markupDoc.html).setEscapeModelStrings(false);\r

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
index 3ce5484eecaf294db1ed1f14f8014b438cd0c4f3..25c247380b55ae9abebebd5b23f7366520205863 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -274,7 +274,7 @@ public class TicketPage extends RepositoryPage {
                                closed = tm.getClosedTickets();\r
                        }\r
 \r
-                       Fragment milestoneProgress = new Fragment("milestone", "milestoneProgressFragment", this);\r
+                       Fragment milestoneProgress = new Fragment("milestone", "milestoneProgressFragment", TicketPage.this);\r
                        milestoneProgress.add(new LinkPanel("link", null, ticket.milestone, TicketsPage.class, milestoneParameters));\r
                        Label label = new Label("progress");\r
                        WicketUtils.setCssStyle(label, "width:" + progress + "%;");\r
@@ -333,7 +333,7 @@ public class TicketPage extends RepositoryPage {
                /*\r
                 * LARGE STATUS INDICATOR WITH ICON (DISCUSSION TAB->SIDE BAR)\r
                 */\r
-               Fragment ticketStatus = new Fragment("ticketStatus", "ticketStatusFragment", this);\r
+               Fragment ticketStatus = new Fragment("ticketStatus", "ticketStatusFragment", TicketPage.this);\r
                Label ticketIcon = TicketsUI.getStateIcon("ticketIcon", ticket);\r
                ticketStatus.add(ticketIcon);\r
                ticketStatus.add(new Label("ticketStatus", ticket.status.toString()));\r
@@ -349,7 +349,7 @@ public class TicketPage extends RepositoryPage {
                                /*\r
                                 * OPEN TICKET\r
                                 */\r
-                               Fragment controls = new Fragment("controls", "openControlsFragment", this);\r
+                               Fragment controls = new Fragment("controls", "openControlsFragment", TicketPage.this);\r
 \r
                                /*\r
                                 * STATUS\r
@@ -509,7 +509,7 @@ public class TicketPage extends RepositoryPage {
                                /*\r
                                 * CLOSED TICKET\r
                                 */\r
-                               Fragment controls = new Fragment("controls", "closedControlsFragment", this);\r
+                               Fragment controls = new Fragment("controls", "closedControlsFragment", TicketPage.this);\r
 \r
                                String editHref = urlFor(EditTicketPage.class, params).toString();\r
                                controls.add(new ExternalLink("editLink", editHref, getString("gb.edit")));\r
@@ -648,7 +648,7 @@ public class TicketPage extends RepositoryPage {
                if (comments.size() == 0) {\r
                        add(new Label("discussion").setVisible(false));\r
                } else {\r
-                       Fragment discussionFragment = new Fragment("discussion", "discussionFragment", this);\r
+                       Fragment discussionFragment = new Fragment("discussion", "discussionFragment", TicketPage.this);\r
                        ListDataProvider<Change> discussionDp = new ListDataProvider<Change>(discussion);\r
                        DataView<Change> discussionView = new DataView<Change>("discussion", discussionDp) {\r
                                private static final long serialVersionUID = 1L;\r
@@ -681,7 +681,7 @@ public class TicketPage extends RepositoryPage {
                                                        commitLink = mergedPatch.toString();\r
                                                }\r
 \r
-                                               Fragment mergeFragment = new Fragment("entry", "mergeFragment", this);\r
+                                               Fragment mergeFragment = new Fragment("entry", "mergeFragment", TicketPage.this);\r
                                                mergeFragment.add(new LinkPanel("commitLink", null, commitLink,\r
                                                                CommitPage.class, WicketUtils.newObjectParameter(repositoryName, resolvedBy)));\r
                                                mergeFragment.add(new Label("toBranch", MessageFormat.format(getString("gb.toBranch"),\r
@@ -694,7 +694,7 @@ public class TicketPage extends RepositoryPage {
                                                /*\r
                                                 *  STATUS CHANGE\r
                                                 */\r
-                                               Fragment frag = new Fragment("entry", "statusFragment", this);\r
+                                               Fragment frag = new Fragment("entry", "statusFragment", TicketPage.this);\r
                                                Label status = new Label("statusChange", entry.getStatus().toString());\r
                                                String css = TicketsUI.getLozengeClass(entry.getStatus(), false);\r
                                                WicketUtils.setCssClass(status, css);\r
@@ -709,7 +709,7 @@ public class TicketPage extends RepositoryPage {
                                                String bugtraq = bugtraqProcessor().processText(getRepository(), repositoryName, entry.comment.text);\r
                                                String comment = MarkdownUtils.transformGFM(app().settings(), bugtraq, repositoryName);\r
                                                String safeComment = app().xssFilter().relaxed(comment);\r
-                                               Fragment frag = new Fragment("entry", "commentFragment", this);\r
+                                               Fragment frag = new Fragment("entry", "commentFragment", TicketPage.this);\r
                                                Label commentIcon = new Label("commentIcon");\r
                                                if (entry.comment.src == CommentSource.Email) {\r
                                                        WicketUtils.setCssClass(commentIcon, "iconic-mail");\r
@@ -741,7 +741,7 @@ public class TicketPage extends RepositoryPage {
                        add(new Label("newComment").setVisible(false));\r
                } else {\r
                        // permit user to comment\r
-                       Fragment newComment = new Fragment("newComment", "newCommentFragment", this);\r
+                       Fragment newComment = new Fragment("newComment", "newCommentFragment", TicketPage.this);\r
                        AvatarImage img = new AvatarImage("newCommentAvatar", user.username, user.emailAddress,\r
                                        "gravatar-round", avatarWidth, true);\r
                        newComment.add(img);\r
@@ -762,7 +762,7 @@ public class TicketPage extends RepositoryPage {
                        if (ticket.isOpen() && app().tickets().isAcceptingNewPatchsets(repository) && canPropose) {\r
                                // ticket & repo will accept a proposal patchset\r
                                // show the instructions for proposing a patchset\r
-                               Fragment changeIdFrag = new Fragment("patchset", "proposeFragment", this);\r
+                               Fragment changeIdFrag = new Fragment("patchset", "proposeFragment", TicketPage.this);\r
                                changeIdFrag.add(new Label("proposeInstructions", MarkdownUtils.transformMarkdown(getString("gb.proposeInstructions"))).setEscapeModelStrings(false));\r
                                changeIdFrag.add(new Label("ptWorkflow", MessageFormat.format(getString("gb.proposeWith"), "Barnum")));\r
                                changeIdFrag.add(new Label("ptWorkflowSteps", getProposeWorkflow("propose_pt.md", repoUrl.url, ticket.number)).setEscapeModelStrings(false));\r
@@ -771,7 +771,7 @@ public class TicketPage extends RepositoryPage {
                                add(changeIdFrag);\r
                        } else {\r
                                // explain why you can't propose a patchset\r
-                               Fragment fragment = new Fragment("patchset", "canNotProposeFragment", this);\r
+                               Fragment fragment = new Fragment("patchset", "canNotProposeFragment", TicketPage.this);\r
                                String reason = "";\r
                                if (ticket.isClosed()) {\r
                                        reason = getString("gb.ticketIsClosed");\r
@@ -795,7 +795,7 @@ public class TicketPage extends RepositoryPage {
                        }\r
                } else {\r
                        // show current patchset\r
-                       Fragment patchsetFrag = new Fragment("patchset", "patchsetFragment", this);\r
+                       Fragment patchsetFrag = new Fragment("patchset", "patchsetFragment", TicketPage.this);\r
                        patchsetFrag.add(new Label("commitsInPatchset", MessageFormat.format(getString("gb.commitsInPatchsetN"), currentPatchset.number)));\r
 \r
                        patchsetFrag.add(createMergePanel(user, repository));\r
@@ -842,7 +842,7 @@ public class TicketPage extends RepositoryPage {
                /*\r
                 * ACTIVITY TAB\r
                 */\r
-               Fragment revisionHistory = new Fragment("activity", "activityFragment", this);\r
+               Fragment revisionHistory = new Fragment("activity", "activityFragment", TicketPage.this);\r
                List<Change> events = new ArrayList<Change>(ticket.changes);\r
                Collections.sort(events);\r
                Collections.reverse(events);\r
@@ -1090,7 +1090,7 @@ public class TicketPage extends RepositoryPage {
                patchsets.remove(currentPatchset);\r
                Collections.reverse(patchsets);\r
 \r
-               Fragment panel = new Fragment(wicketId, "collapsiblePatchsetFragment", this);\r
+               Fragment panel = new Fragment(wicketId, "collapsiblePatchsetFragment", TicketPage.this);\r
 \r
                // patchset header\r
                String ps = "<b>" + currentPatchset.number + "</b>";\r
@@ -1167,7 +1167,7 @@ public class TicketPage extends RepositoryPage {
                        }\r
 \r
                        // user can review, add review controls\r
-                       Fragment reviewControls = new Fragment("reviewControls", "reviewControlsFragment", this);\r
+                       Fragment reviewControls = new Fragment("reviewControls", "reviewControlsFragment", TicketPage.this);\r
 \r
                        // show "approve" button if no review OR not current score\r
                        if (user.canApprovePatchset(repository) && (myReview == null || Score.approved != myReview.score)) {\r
@@ -1415,7 +1415,7 @@ public class TicketPage extends RepositoryPage {
                if (allowMerge) {\r
                        if (MergeStatus.MERGEABLE == mergeStatus) {\r
                                // patchset can be cleanly merged to integration branch OR has already been merged\r
-                               Fragment mergePanel = new Fragment("mergePanel", "mergeableFragment", this);\r
+                               Fragment mergePanel = new Fragment("mergePanel", "mergeableFragment", TicketPage.this);\r
                                mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetMergeable"), ticket.mergeTo)));\r
                                if (user.canPush(repository)) {\r
                                        // user can merge locally\r
@@ -1482,18 +1482,18 @@ public class TicketPage extends RepositoryPage {
                                return mergePanel;\r
                        } else if (MergeStatus.ALREADY_MERGED == mergeStatus) {\r
                                // patchset already merged\r
-                               Fragment mergePanel = new Fragment("mergePanel", "alreadyMergedFragment", this);\r
+                               Fragment mergePanel = new Fragment("mergePanel", "alreadyMergedFragment", TicketPage.this);\r
                                mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetAlreadyMerged"), ticket.mergeTo)));\r
                                return mergePanel;\r
                        } else if (MergeStatus.MISSING_INTEGRATION_BRANCH == mergeStatus) {\r
                                // target/integration branch is missing\r
-                               Fragment mergePanel = new Fragment("mergePanel", "notMergeableFragment", this);\r
+                               Fragment mergePanel = new Fragment("mergePanel", "notMergeableFragment", TicketPage.this);\r
                                mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetNotMergeable"), ticket.mergeTo)));\r
                                mergePanel.add(new Label("mergeMore", MessageFormat.format(getString("gb.missingIntegrationBranchMore"), ticket.mergeTo)));\r
                                return mergePanel;\r
                        } else {\r
                                // patchset can not be cleanly merged\r
-                               Fragment mergePanel = new Fragment("mergePanel", "notMergeableFragment", this);\r
+                               Fragment mergePanel = new Fragment("mergePanel", "notMergeableFragment", TicketPage.this);\r
                                mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetNotMergeable"), ticket.mergeTo)));\r
                                if (user.canPush(repository)) {\r
                                        // user can merge locally\r
@@ -1508,17 +1508,17 @@ public class TicketPage extends RepositoryPage {
                        // merge not allowed\r
                        if (MergeStatus.ALREADY_MERGED == mergeStatus) {\r
                                // patchset already merged\r
-                               Fragment mergePanel = new Fragment("mergePanel", "alreadyMergedFragment", this);\r
+                               Fragment mergePanel = new Fragment("mergePanel", "alreadyMergedFragment", TicketPage.this);\r
                                mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetAlreadyMerged"), ticket.mergeTo)));\r
                                return mergePanel;\r
                        } else if (ticket.isVetoed(patchset)) {\r
                                // patchset has been vetoed\r
-                               Fragment mergePanel =  new Fragment("mergePanel", "vetoedFragment", this);\r
+                               Fragment mergePanel =  new Fragment("mergePanel", "vetoedFragment", TicketPage.this);\r
                                mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetNotMergeable"), ticket.mergeTo)));\r
                                return mergePanel;\r
                        } else if (repository.requireApproval) {\r
                                // patchset has been not been approved for merge\r
-                               Fragment mergePanel = new Fragment("mergePanel", "notApprovedFragment", this);\r
+                               Fragment mergePanel = new Fragment("mergePanel", "notApprovedFragment", TicketPage.this);\r
                                mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetNotApproved"), ticket.mergeTo)));\r
                                mergePanel.add(new Label("mergeMore", MessageFormat.format(getString("gb.patchsetNotApprovedMore"), ticket.mergeTo)));\r
                                return mergePanel;\r
@@ -1530,7 +1530,7 @@ public class TicketPage extends RepositoryPage {
        }\r
 \r
        protected Component getMergeInstructions(UserModel user, RepositoryModel repository, String markupId, String infoKey) {\r
-               Fragment cmd = new Fragment(markupId, "commandlineMergeFragment", this);\r
+               Fragment cmd = new Fragment(markupId, "commandlineMergeFragment", TicketPage.this);\r
                cmd.add(new Label("instructions", MessageFormat.format(getString(infoKey), ticket.mergeTo)));\r
 \r
                // git instructions\r
@@ -1639,7 +1639,7 @@ public class TicketPage extends RepositoryPage {
        protected Fragment createCopyFragment(String wicketId, String text) {\r
                if (app().settings().getBoolean(Keys.web.allowFlashCopyToClipboard, true)) {\r
                        // clippy: flash-based copy & paste\r
-                       Fragment copyFragment = new Fragment(wicketId, "clippyPanel", this);\r
+                       Fragment copyFragment = new Fragment(wicketId, "clippyPanel", TicketPage.this);\r
                        String baseUrl = WicketUtils.getGitblitURL(getRequest());\r
                        ShockWaveComponent clippy = new ShockWaveComponent("clippy", baseUrl + "/clippy.swf");\r
                        clippy.setValue("flashVars", "text=" + StringUtils.encodeURL(text));\r
@@ -1647,7 +1647,7 @@ public class TicketPage extends RepositoryPage {
                        return copyFragment;\r
                } else {\r
                        // javascript: manual copy & paste with modal browser prompt dialog\r
-                       Fragment copyFragment = new Fragment(wicketId, "jsPanel", this);\r
+                       Fragment copyFragment = new Fragment(wicketId, "jsPanel", TicketPage.this);\r
                        ContextImage img = WicketUtils.newImage("copyIcon", "clippy.png");\r
                        img.add(new JavascriptTextPrompt("onclick", "Copy to Clipboard (Ctrl+C, Enter)", text));\r
                        copyFragment.add(img);\r

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
index 15dfe0e80dab45fa3685f360e2b34096d67e7d99..560cd40d9e68457494c53c682af7233d7508c9f8 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
@@ -165,10 +165,10 @@ public class TicketsPage extends RepositoryPage {
 \r
                Fragment milestonePanel;\r
                if (currentMilestone == null) {\r
-                       milestonePanel = new Fragment("milestonePanel", "noMilestoneFragment", this);\r
+                       milestonePanel = new Fragment("milestonePanel", "noMilestoneFragment", TicketsPage.this);\r
                        add(milestonePanel);\r
                } else {\r
-                       milestonePanel = new Fragment("milestonePanel", "milestoneProgressFragment", this);\r
+                       milestonePanel = new Fragment("milestonePanel", "milestoneProgressFragment", TicketsPage.this);\r
                        milestonePanel.add(new Label("currentMilestone", currentMilestone.name));\r
                        if (currentMilestone.due == null) {\r
                                milestonePanel.add(new Label("currentDueDate", getString("gb.notSpecified")));\r
@@ -194,7 +194,7 @@ public class TicketsPage extends RepositoryPage {
                        add(milestonePanel);\r
                }\r
 \r
-               Fragment milestoneDropdown = new Fragment("milestoneDropdown", "milestoneDropdownFragment", this);\r
+               Fragment milestoneDropdown = new Fragment("milestoneDropdown", "milestoneDropdownFragment", TicketsPage.this);\r
                PageParameters resetMilestone = queryParameters(queryParam, null, statiiParam, assignedToParam, sortBy, desc, 1);\r
                milestoneDropdown.add(new BookmarkablePageLink<Void>("resetMilestone", TicketsPage.class, resetMilestone));\r
 \r
@@ -354,7 +354,7 @@ public class TicketsPage extends RepositoryPage {
                if (dynamicQueries.size() == 0) {\r
                        add(new Label("dynamicQueries").setVisible(false));\r
                } else {\r
-                       Fragment fragment = new Fragment("dynamicQueries", "dynamicQueriesFragment", this);\r
+                       Fragment fragment = new Fragment("dynamicQueries", "dynamicQueriesFragment", TicketsPage.this);\r
                        ListDataProvider<TicketQuery> dynamicQueriesDp = new ListDataProvider<TicketQuery>(new ArrayList<TicketQuery>(dynamicQueries));\r
                        DataView<TicketQuery> dynamicQueriesList = new DataView<TicketQuery>("dynamicQuery", dynamicQueriesDp) {\r
                                private static final long serialVersionUID = 1L;\r
@@ -547,7 +547,7 @@ public class TicketsPage extends RepositoryPage {
 \r
                        @Override\r
                        public void populateItem(final Item<TicketMilestone> item) {\r
-                               Fragment entryPanel = new Fragment("entryPanel", "milestoneListFragment", this);\r
+                               Fragment entryPanel = new Fragment("entryPanel", "milestoneListFragment", TicketsPage.this);\r
                                item.add(entryPanel);\r
 \r
                                final TicketMilestone tm = item.getModelObject();\r
@@ -595,7 +595,7 @@ public class TicketsPage extends RepositoryPage {
                                        // re-load milestone with query results\r
                                        TicketMilestone m = app().tickets().getMilestone(getRepositoryModel(), tm.name);\r
 \r
-                                       Fragment milestonePanel = new Fragment("milestonePanel", "openMilestoneFragment", this);\r
+                                       Fragment milestonePanel = new Fragment("milestonePanel", "openMilestoneFragment", TicketsPage.this);\r
                                        Label label = new Label("progress");\r
                                        WicketUtils.setCssStyle(label, "width:" + m.getProgress() + "%;");\r
                                        milestonePanel.add(label);\r

diff --git a/src/main/java/com/gitblit/wicket/pages/TreePage.java b/src/main/java/com/gitblit/wicket/pages/TreePage.java
index 79b7460ea2c16f7ec014480ec6b6558d5fcbee62..98bb1d7ac92396dc29ed5d89e514cd7a409ea15c 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/TreePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TreePage.java
@@ -120,7 +120,7 @@ public class TreePage extends RepositoryPage {
                                                                WicketUtils.newPathParameter(repositoryName, id, entry.path)));\r
 \r
                                                // links\r
-                                               Fragment links = new Fragment("pathLinks", "treeLinks", this);\r
+                                               Fragment links = new Fragment("pathLinks", "treeLinks", TreePage.this);\r
                                                links.add(new BookmarkablePageLink<Void>("tree", TreePage.class,\r
                                                                WicketUtils.newPathParameter(repositoryName, id, entry.path)));\r
                                                links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class,\r
@@ -144,7 +144,7 @@ public class TreePage extends RepositoryPage {
                                                                TreePage.class, WicketUtils.newPathParameter(submodulePath, submoduleId, ""))\r
                                                                                .setEnabled(hasSubmodule));\r
 \r
-                                               Fragment links = new Fragment("pathLinks", "submoduleLinks", this);\r
+                                               Fragment links = new Fragment("pathLinks", "submoduleLinks", TreePage.this);\r
                                                links.add(new BookmarkablePageLink<Void>("view", SummaryPage.class,\r
                                                                WicketUtils.newRepositoryParameter(submodulePath)).setEnabled(hasSubmodule));\r
                                                links.add(new BookmarkablePageLink<Void>("tree", TreePage.class,\r
@@ -167,7 +167,7 @@ public class TreePage extends RepositoryPage {
                                                item.add(new Label("pathSize", byteFormat.format(entry.size)));\r
 \r
                                                // links\r
-                                               Fragment links = new Fragment("pathLinks", "blobLinks", this);\r
+                                               Fragment links = new Fragment("pathLinks", "blobLinks", TreePage.this);\r
 \r
                                                if (entry.isFilestoreItem()) {\r
                                                        item.add(new LinkPanel("pathName", "list", displayPath, new Link<Object>("link", null) {\r

diff --git a/src/main/java/com/gitblit/wicket/pages/UserPage.java b/src/main/java/com/gitblit/wicket/pages/UserPage.java
index 284970ff51020277f2b681ae538ae43a26802237..b37e75d8b836b032df781c01cccf38d5d91dc779 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/UserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.java
@@ -301,17 +301,17 @@ public class UserPage extends RootPage {
 \r
                // add the preferences tab\r
                add(new Fragment("preferencesLink", "preferencesLinkFragment", this).setRenderBodyOnly(true));\r
-               Fragment fragment = new Fragment("preferencesTab", "preferencesTabFragment", this);\r
+               Fragment fragment = new Fragment("preferencesTab", "preferencesTabFragment", UserPage.this);\r
                fragment.add(prefs);\r
                add(fragment.setRenderBodyOnly(true));\r
        }\r
 \r
        private void addSshKeys(final UserModel user) {\r
-               Fragment keysTab = new Fragment("sshKeysTab", "sshKeysTabFragment", this);\r
+               Fragment keysTab = new Fragment("sshKeysTab", "sshKeysTabFragment", UserPage.this);\r
                keysTab.add(new SshKeysPanel("sshKeysPanel", user));\r
 \r
                // add the SSH keys tab\r
-               add(new Fragment("sshKeysLink", "sshKeysLinkFragment", this).setRenderBodyOnly(true));\r
+               add(new Fragment("sshKeysLink", "sshKeysLinkFragment", UserPage.this).setRenderBodyOnly(true));\r
                add(keysTab.setRenderBodyOnly(true));\r
        }\r
 \r

diff --git a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
index 2c880247f95c70d2ddaf23e7fd8c26fb04908331..25895ec85007cc21b151c2f5785dd1a6c905c62a 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
@@ -145,7 +145,7 @@ public class AccessPolicyPanel extends BasePanel {
                add(policiesGroup);\r
 \r
                if (app().settings().getBoolean(Keys.web.allowForking, true)) {\r
-                       Fragment fragment = new Fragment("allowForks", "allowForksFragment", this);\r
+                       Fragment fragment = new Fragment("allowForks", "allowForksFragment", AccessPolicyPanel.this);\r
                        fragment.add(new BooleanOption("allowForks",\r
                                getString("gb.allowForks"),\r
                                getString("gb.allowForksDescription"),\r

diff --git a/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
index d5dc1a37619becccb2b945b96070b988e2453ad6..92e7fb6d78b3a462a91bdab46589f903a5796e73 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
@@ -140,7 +140,7 @@ public class BranchesPanel extends BasePanel {
                                item.add(shortlog);\r
 \r
                                if (maxCount <= 0) {\r
-                                       Fragment fragment = new Fragment("branchLinks", showDelete? "branchPageAdminLinks" : "branchPageLinks", this);\r
+                                       Fragment fragment = new Fragment("branchLinks", showDelete? "branchPageAdminLinks" : "branchPageLinks", BranchesPanel.this);\r
                                        fragment.add(new BookmarkablePageLink<Void>("log", LogPage.class, shortUniqRef));\r
                                        fragment.add(new BookmarkablePageLink<Void>("tree", TreePage.class, shortUniqRef));\r
                                        String rawUrl = RawServlet.asLink(getContextUrl(), model.name, Repository.shortenRefName(entry.getName()), null);\r
@@ -154,7 +154,7 @@ public class BranchesPanel extends BasePanel {
                                        }\r
                                        item.add(fragment);\r
                                } else {\r
-                                       Fragment fragment = new Fragment("branchLinks", "branchPanelLinks", this);\r
+                                       Fragment fragment = new Fragment("branchLinks", "branchPanelLinks", BranchesPanel.this);\r
                                        fragment.add(new BookmarkablePageLink<Void>("log", LogPage.class, shortUniqRef));\r
                                        fragment.add(new BookmarkablePageLink<Void>("tree", TreePage.class, shortUniqRef));\r
                                        String rawUrl = RawServlet.asLink(getContextUrl(), model.name, Repository.shortenRefName(entry.getName()), null);\r

diff --git a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
index 75fd70e76c6d0012d8ca5b496bfb1581c4f634b1..cf5854e1c6ce811cca3682b258e703f08a4f6af8 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
@@ -207,7 +207,7 @@ public class HistoryPanel extends BasePanel {
                                        WicketUtils.setHtmlTooltip(commitHash, entry.getName());\r
                                        item.add(commitHash);\r
 \r
-                                       Fragment links = new Fragment("historyLinks", "treeLinks", this);\r
+                                       Fragment links = new Fragment("historyLinks", "treeLinks", HistoryPanel.this);\r
                                        links.add(new BookmarkablePageLink<Void>("commitdiff", CommitDiffPage.class,\r
                                                        WicketUtils.newObjectParameter(repositoryName, entry.getName())));\r
                                        item.add(links);\r
@@ -230,7 +230,7 @@ public class HistoryPanel extends BasePanel {
                                                WicketUtils.setHtmlTooltip(commitHash, submoduleId);\r
                                                item.add(commitHash.setEnabled(hasSubmodule));\r
                                        }\r
-                                       Fragment links = new Fragment("historyLinks", "treeLinks", this);\r
+                                       Fragment links = new Fragment("historyLinks", "treeLinks", HistoryPanel.this);\r
                                        links.add(new BookmarkablePageLink<Void>("commitdiff", CommitDiffPage.class,\r
                                                        WicketUtils.newObjectParameter(repositoryName, entry.getName())));\r
                                        item.add(links);\r
@@ -244,7 +244,7 @@ public class HistoryPanel extends BasePanel {
                                        WicketUtils.setHtmlTooltip(commitHash, entry.getName());\r
                                        item.add(commitHash);\r
 \r
-                                       Fragment links = new Fragment("historyLinks", "blobLinks", this);\r
+                                       Fragment links = new Fragment("historyLinks", "blobLinks", HistoryPanel.this);\r
                                        links.add(new BookmarkablePageLink<Void>("commitdiff", CommitDiffPage.class,\r
                                                        WicketUtils.newObjectParameter(repositoryName, entry.getName())));\r
                                        links.add(new BookmarkablePageLink<Void>("difftocurrent", BlobDiffPage.class,\r

diff --git a/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
index 503b3d129d4531d4fbd3a23d99f320d67ca936ad..6c0d1c67ab70e248a881739f50bf2479d3444f44 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
@@ -60,13 +60,13 @@ public class ProjectRepositoryPanel extends BasePanel {
 \r
                Fragment iconFragment;\r
                if (entry.isMirror) {\r
-                       iconFragment = new Fragment("repoIcon", "mirrorIconFragment", this);\r
+                       iconFragment = new Fragment("repoIcon", "mirrorIconFragment", ProjectRepositoryPanel.this);\r
                } else if (entry.isFork()) {\r
-                       iconFragment = new Fragment("repoIcon", "forkIconFragment", this);\r
+                       iconFragment = new Fragment("repoIcon", "forkIconFragment", ProjectRepositoryPanel.this);\r
                } else if (entry.isBare) {\r
-                       iconFragment = new Fragment("repoIcon", "repoIconFragment", this);\r
+                       iconFragment = new Fragment("repoIcon", "repoIconFragment", ProjectRepositoryPanel.this);\r
                } else {\r
-                       iconFragment = new Fragment("repoIcon", "cloneIconFragment", this);\r
+                       iconFragment = new Fragment("repoIcon", "cloneIconFragment", ProjectRepositoryPanel.this);\r
                }\r
                if (showSwatch) {\r
                        WicketUtils.setCssStyle(iconFragment, "color:" + StringUtils.getColor(entry.toString()));\r
@@ -76,7 +76,7 @@ public class ProjectRepositoryPanel extends BasePanel {
                if (StringUtils.isEmpty(entry.originRepository)) {\r
                        add(new Label("originRepository").setVisible(false));\r
                } else {\r
-                       Fragment forkFrag = new Fragment("originRepository", "originFragment", this);\r
+                       Fragment forkFrag = new Fragment("originRepository", "originFragment", ProjectRepositoryPanel.this);\r
                        forkFrag.add(new LinkPanel("originRepository", null, StringUtils.stripDotGit(entry.originRepository),\r
                                        SummaryPage.class, WicketUtils.newRepositoryParameter(entry.originRepository)));\r
                        add(forkFrag);\r
@@ -126,11 +126,11 @@ public class ProjectRepositoryPanel extends BasePanel {
                }\r
                Fragment repositoryLinks;\r
                if (user.canAdmin(entry)) {\r
-                       repositoryLinks = new Fragment("repositoryLinks", "repositoryOwnerLinks", this);\r
+                       repositoryLinks = new Fragment("repositoryLinks", "repositoryOwnerLinks", ProjectRepositoryPanel.this);\r
                        repositoryLinks.add(new BookmarkablePageLink<Void>("editRepository", EditRepositoryPage.class,\r
                                        WicketUtils.newRepositoryParameter(entry.name)));\r
                } else {\r
-                       repositoryLinks = new Fragment("repositoryLinks", "repositoryUserLinks", this);\r
+                       repositoryLinks = new Fragment("repositoryLinks", "repositoryUserLinks", ProjectRepositoryPanel.this);\r
                }\r
 \r
                repositoryLinks.add(new BookmarkablePageLink<Void>("tree", TreePage.class, WicketUtils\r

diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java
index 549c92b59fc2138d8ebe3aada383c29f8cbfff4f..19fe46c1ab4fd0784b75d11edea8ef990d9c587e 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java
@@ -119,7 +119,7 @@ public class RepositoryUrlPanel extends BasePanel {
 \r
        protected Fragment createPrimaryUrlPanel(String wicketId, final RepositoryModel repository, List<RepositoryUrl> repositoryUrls) {\r
 \r
-               Fragment urlPanel = new Fragment(wicketId, "repositoryUrlFragment", this);\r
+               Fragment urlPanel = new Fragment(wicketId, "repositoryUrlFragment", RepositoryUrlPanel.this);\r
                urlPanel.setRenderBodyOnly(true);\r
 \r
                if (repositoryUrls.size() == 1) {\r
@@ -139,7 +139,7 @@ public class RepositoryUrlPanel extends BasePanel {
                                public void populateItem(final Item<RepositoryUrl> item) {\r
                                        RepositoryUrl repoUrl = item.getModelObject();\r
                                        // repository url\r
-                                       Fragment fragment = new Fragment("repoUrl", "actionFragment", this);\r
+                                       Fragment fragment = new Fragment("repoUrl", "actionFragment", RepositoryUrlPanel.this);\r
                                        Component content = new Label("content", repoUrl.url).setRenderBodyOnly(true);\r
                                        WicketUtils.setCssClass(content, "commandMenuItem");\r
                                        fragment.add(content);\r
@@ -154,7 +154,7 @@ public class RepositoryUrlPanel extends BasePanel {
                                }\r
                        };\r
 \r
-                       Fragment urlMenuFragment = new Fragment("menu", "urlProtocolMenuFragment", this);\r
+                       Fragment urlMenuFragment = new Fragment("menu", "urlProtocolMenuFragment", RepositoryUrlPanel.this);\r
                        urlMenuFragment.setRenderBodyOnly(true);\r
                        urlMenuFragment.add(new Label("menuText", getString("gb.url")));\r
                        urlMenuFragment.add(repoUrlMenuItems);\r
@@ -253,7 +253,7 @@ public class RepositoryUrlPanel extends BasePanel {
                                        return;\r
                                }\r
 \r
-                               Fragment appMenu = new Fragment("appMenu", "appMenuFragment", this);\r
+                               Fragment appMenu = new Fragment("appMenu", "appMenuFragment", RepositoryUrlPanel.this);\r
                                appMenu.setRenderBodyOnly(true);\r
                                item.add(appMenu);\r
 \r
@@ -304,7 +304,7 @@ public class RepositoryUrlPanel extends BasePanel {
                                        @Override\r
                                        public void populateItem(final Item<RepositoryUrl> repoLinkItem) {\r
                                                RepositoryUrl repoUrl = repoLinkItem.getModelObject();\r
-                                               Fragment fragment = new Fragment("actionItem", "actionFragment", this);\r
+                                               Fragment fragment = new Fragment("actionItem", "actionFragment", RepositoryUrlPanel.this);\r
                                                fragment.add(createPermissionBadge("permission", repoUrl));\r
 \r
                                                if (!StringUtils.isEmpty(clientApp.cloneUrl)) {\r
@@ -329,7 +329,7 @@ public class RepositoryUrlPanel extends BasePanel {
                        }\r
                };\r
 \r
-               Fragment applicationMenus = new Fragment(wicketId, "applicationMenusFragment", this);\r
+               Fragment applicationMenus = new Fragment(wicketId, "applicationMenusFragment", RepositoryUrlPanel.this);\r
                applicationMenus.add(appMenus);\r
                return applicationMenus;\r
        }\r
@@ -349,7 +349,7 @@ public class RepositoryUrlPanel extends BasePanel {
        protected Fragment createCopyFragment(String text) {\r
                if (app().settings().getBoolean(Keys.web.allowFlashCopyToClipboard, true)) {\r
                        // clippy: flash-based copy & paste\r
-                       Fragment copyFragment = new Fragment("copyFunction", "clippyPanel", this);\r
+                       Fragment copyFragment = new Fragment("copyFunction", "clippyPanel", RepositoryUrlPanel.this);\r
                        String baseUrl = WicketUtils.getGitblitURL(getRequest());\r
                        ShockWaveComponent clippy = new ShockWaveComponent("clippy", baseUrl + "/clippy.swf");\r
                        clippy.setValue("flashVars", "text=" + StringUtils.encodeURL(text));\r
@@ -357,7 +357,7 @@ public class RepositoryUrlPanel extends BasePanel {
                        return copyFragment;\r
                } else {\r
                        // javascript: manual copy & paste with modal browser prompt dialog\r
-                       Fragment copyFragment = new Fragment("copyFunction", "jsPanel", this);\r
+                       Fragment copyFragment = new Fragment("copyFunction", "jsPanel", RepositoryUrlPanel.this);\r
                        ContextImage img = WicketUtils.newImage("copyIcon", "clippy.png");\r
                        img.add(new JavascriptTextPrompt("onclick", "Copy to Clipboard (Ctrl+C, Enter)", text));\r
                        copyFragment.add(img);\r
@@ -441,11 +441,11 @@ public class RepositoryUrlPanel extends BasePanel {
        }\r
 \r
        protected Component createRepositoryIndicators(RepositoryModel repository) {\r
-               Fragment fragment = new Fragment("repositoryIndicators", "indicatorsFragment", this);\r
+               Fragment fragment = new Fragment("repositoryIndicators", "indicatorsFragment", RepositoryUrlPanel.this);\r
                if (repository.isBare) {\r
                        fragment.add(new Label("workingCopyIndicator").setVisible(false));\r
                } else {\r
-                       Fragment wc = new Fragment("workingCopyIndicator", "workingCopyFragment", this);\r
+                       Fragment wc = new Fragment("workingCopyIndicator", "workingCopyFragment", RepositoryUrlPanel.this);\r
                        Label lbl = new Label("workingCopy", getString("gb.workingCopy"));\r
                        WicketUtils.setHtmlTooltip(lbl,  getString("gb.workingCopyWarning"));\r
                        wc.add(lbl);\r
@@ -464,7 +464,7 @@ public class RepositoryUrlPanel extends BasePanel {
                        if (hasFork || !canFork) {\r
                                if (user.canFork() && !repository.allowForks) {\r
                                        // show forks prohibited indicator\r
-                                       Fragment wc = new Fragment("forksProhibitedIndicator", "forksProhibitedFragment", this);\r
+                                       Fragment wc = new Fragment("forksProhibitedIndicator", "forksProhibitedFragment", RepositoryUrlPanel.this);\r
                                        Label lbl = new Label("forksProhibited", getString("gb.forksProhibited"));\r
                                        WicketUtils.setHtmlTooltip(lbl,  getString("gb.forksProhibitedWarning"));\r
                                        wc.add(lbl);\r

diff --git a/src/main/java/com/gitblit/wicket/panels/TagsPanel.java b/src/main/java/com/gitblit/wicket/panels/TagsPanel.java
index 9926d1132eec23886a42577816a2208b5accbd4c..85a50139d99fda9d1d027885eb32e0e0a0950d9f 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/TagsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/TagsPanel.java
@@ -106,7 +106,7 @@ public class TagsPanel extends BasePanel {
                                        }\r
                                        item.add(messageLink);\r
 \r
-                                       Fragment fragment = new Fragment("tagLinks", "blobLinks", this);\r
+                                       Fragment fragment = new Fragment("tagLinks", "blobLinks", TagsPanel.this);\r
                                        fragment.add(new BookmarkablePageLink<Void>("tag", TagPage.class, WicketUtils\r
                                                        .newObjectParameter(repositoryName, entry.getObjectId().getName()))\r
                                                        .setEnabled(entry.isAnnotatedTag()));\r
@@ -133,7 +133,7 @@ public class TagsPanel extends BasePanel {
                                                }\r
                                                item.add(messageLink);\r
 \r
-                                               Fragment fragment = new Fragment("tagLinks", "annotatedLinks", this);\r
+                                               Fragment fragment = new Fragment("tagLinks", "annotatedLinks", TagsPanel.this);\r
                                                fragment.add(new BookmarkablePageLink<Void>("tag", TagPage.class,\r
                                                                WicketUtils.newObjectParameter(repositoryName, entry.getObjectId()\r
                                                                                .getName())).setEnabled(entry.isAnnotatedTag()));\r
@@ -150,7 +150,7 @@ public class TagsPanel extends BasePanel {
                                                item.add(new LinkPanel("tagDescription", "list", message, CommitPage.class,\r
                                                                WicketUtils.newObjectParameter(repositoryName, entry.getObjectId()\r
                                                                                .getName())));\r
-                                               Fragment fragment = new Fragment("tagLinks", "lightweightLinks", this);\r
+                                               Fragment fragment = new Fragment("tagLinks", "lightweightLinks", TagsPanel.this);\r
                                                fragment.add(new BookmarkablePageLink<Void>("commit", CommitPage.class,\r
                                                                WicketUtils.newObjectParameter(repositoryName, entry\r
                                                                                .getReferencedObjectId().getName())));\r

diff --git a/src/main/java/com/gitblit/wicket/panels/TeamsPanel.java b/src/main/java/com/gitblit/wicket/panels/TeamsPanel.java
index 7f3fd9a2399b32ab69abb0001d9ed953a95d5efc..69c64fc7357fa87f24a89bd02038758930fc579a 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/TeamsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/TeamsPanel.java
@@ -37,7 +37,7 @@ public class TeamsPanel extends BasePanel {
        public TeamsPanel(String wicketId, final boolean showAdmin) {\r
                super(wicketId);\r
 \r
-               Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);\r
+               Fragment adminLinks = new Fragment("adminPanel", "adminLinks", TeamsPanel.this);\r
                adminLinks.add(new BookmarkablePageLink<Void>("newTeam", EditTeamPage.class));\r
                add(adminLinks.setVisible(showAdmin));\r
 \r
@@ -65,7 +65,7 @@ public class TeamsPanel extends BasePanel {
                                                : ""));\r
                                item.add(new Label("repositories",\r
                                                entry.repositories.size() > 0 ? ("" + entry.repositories.size()) : ""));\r
-                               Fragment teamLinks = new Fragment("teamLinks", "teamAdminLinks", this);\r
+                               Fragment teamLinks = new Fragment("teamLinks", "teamAdminLinks", TeamsPanel.this);\r
                                teamLinks.add(new BookmarkablePageLink<Void>("editTeam", EditTeamPage.class,\r
                                                WicketUtils.newTeamnameParameter(entry.name)));\r
                                Link<Void> deleteLink = new Link<Void>("deleteTeam") {\r

diff --git a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
index b247228b2ff6bdb3bffbfba38b3b7e259919f12b..6c6435bb5b21f30540b6ac84cd0398fb94475d0f 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
@@ -101,7 +101,7 @@ public class TicketListPanel extends BasePanel {
                                if (ticket.updatedAt == null) {
                                        item.add(new Label("updated").setVisible(false));
                                } else {
-                                       Fragment updated = new Fragment("updated", "updatedFragment", this);
+                                       Fragment updated = new Fragment("updated", "updatedFragment", TicketListPanel.this);
                                        UserModel updater = app().users().getUserModel(ticket.updatedBy);
                                        if (updater != null) {
                                                updated.add(new LinkPanel("updatedBy", null, updater.getDisplayName(),

diff --git a/src/main/java/com/gitblit/wicket/panels/UsersPanel.java b/src/main/java/com/gitblit/wicket/panels/UsersPanel.java
index 5d6265525430cf1de642ac927302f1444ace5ce9..7200cb76fdb6e756f7998011590e2b445ba6564a 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/UsersPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/UsersPanel.java
@@ -38,7 +38,7 @@ public class UsersPanel extends BasePanel {
        public UsersPanel(String wicketId, final boolean showAdmin) {\r
                super(wicketId);\r
 \r
-               Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);\r
+               Fragment adminLinks = new Fragment("adminPanel", "adminLinks", UsersPanel.this);\r
                adminLinks.add(new BookmarkablePageLink<Void>("newUser", EditUserPage.class));\r
                add(adminLinks.setVisible(showAdmin));\r
 \r
@@ -85,7 +85,7 @@ public class UsersPanel extends BasePanel {
                                item.add(new Label("teams", entry.teams.size() > 0 ? ("" + entry.teams.size()) : ""));\r
                                item.add(new Label("repositories",\r
                                                entry.permissions.size() > 0 ? ("" + entry.permissions.size()) : ""));\r
-                               Fragment userLinks = new Fragment("userLinks", "userAdminLinks", this);\r
+                               Fragment userLinks = new Fragment("userLinks", "userAdminLinks", UsersPanel.this);\r
                                userLinks.add(new BookmarkablePageLink<Void>("editUser", EditUserPage.class,\r
                                                WicketUtils.newUsernameParameter(entry.username)));\r
                                Link<Void> deleteLink = new Link<Void>("deleteUser") {\r