Remove remaining TicGit tickets references

James Moger

2013-09-30 cd92bed21e36ec11599da13c3daf0036817a0baf

Remove remaining TicGit tickets references

Change-Id: I431659cf1d57a8d9bffb065fa47e1296e7f8c838

 src/main/java/com/gitblit/GitBlit.java

@@ -2002,7 +2002,6 @@
            model.description = getConfig(config, "description", "");
            model.originRepository = getConfig(config, "originRepository", null);
            model.addOwners(ArrayUtils.fromString(getConfig(config, "owner", "")));
            model.useTickets = getConfig(config, "useTickets", false);
            model.useDocs = getConfig(config, "useDocs", false);
            model.useIncrementalPushTags = getConfig(config, "useIncrementalPushTags", false);
            model.incrementalPushTagPrefix = getConfig(config, "incrementalPushTagPrefix", null);
@@ -2563,7 +2562,6 @@
        config.setString(Constants.CONFIG_GITBLIT, null, "description", repository.description);
        config.setString(Constants.CONFIG_GITBLIT, null, "originRepository", repository.originRepository);
        config.setString(Constants.CONFIG_GITBLIT, null, "owner", ArrayUtils.toString(repository.owners));
        config.setBoolean(Constants.CONFIG_GITBLIT, null, "useTickets", repository.useTickets);
        config.setBoolean(Constants.CONFIG_GITBLIT, null, "useDocs", repository.useDocs);
        config.setBoolean(Constants.CONFIG_GITBLIT, null, "useIncrementalPushTags", repository.useIncrementalPushTags);
        if (StringUtils.isEmpty(repository.incrementalPushTagPrefix) ||

 src/main/java/com/gitblit/client/EditRepositoryDialog.java

@@ -88,8 +88,6 @@


    private JTextField descriptionField;



    private JCheckBox useTickets;



    private JCheckBox useDocs;



    private JCheckBox useIncrementalPushTags;

@@ -211,8 +209,6 @@


        ownersPalette = new JPalette<String>(true);



        useTickets = new JCheckBox(Translation.get("gb.useTicketsDescription"),

                anRepository.useTickets);

        useDocs = new JCheckBox(Translation.get("gb.useDocsDescription"),

                anRepository.useDocs);

        useIncrementalPushTags = new JCheckBox(Translation.get("gb.useIncrementalPushTagsDescription"),

@@ -310,8 +306,6 @@
        fieldsPanel.add(newFieldPanel(Translation.get("gb.gcPeriod"), gcPeriod));

        fieldsPanel.add(newFieldPanel(Translation.get("gb.gcThreshold"), gcThreshold));



        fieldsPanel.add(newFieldPanel(Translation.get("gb.enableTickets"),

                useTickets));

        fieldsPanel

                .add(newFieldPanel(Translation.get("gb.enableDocs"), useDocs));

        fieldsPanel

@@ -570,7 +564,6 @@
                : headRefField.getSelectedItem().toString();

        repository.gcPeriod = (Integer) gcPeriod.getSelectedItem();

        repository.gcThreshold = gcThreshold.getText();

        repository.useTickets = useTickets.isSelected();

        repository.useDocs = useDocs.isSelected();

        repository.useIncrementalPushTags = useIncrementalPushTags.isSelected();

        repository.showRemoteBranches = showRemoteBranches.isSelected();


 src/main/java/com/gitblit/client/IndicatorsRenderer.java

@@ -46,8 +46,6 @@


    private final ImageIcon viewIcon;



    private final ImageIcon tixIcon;



    private final ImageIcon doxIcon;



    private final ImageIcon frozenIcon;

@@ -64,7 +62,6 @@
        pushIcon = new ImageIcon(getClass().getResource("/lock_go_16x16.png"));

        pullIcon = new ImageIcon(getClass().getResource("/lock_pull_16x16.png"));

        viewIcon = new ImageIcon(getClass().getResource("/shield_16x16.png"));

        tixIcon = new ImageIcon(getClass().getResource("/bug_16x16.png"));

        doxIcon = new ImageIcon(getClass().getResource("/book_16x16.png"));

        frozenIcon = new ImageIcon(getClass().getResource("/cold_16x16.png"));

        federatedIcon = new ImageIcon(getClass().getResource("/federated_16x16.png"));

@@ -91,11 +88,6 @@
            if (model.isFork()) {

                JLabel icon = new JLabel(forkIcon);

                tooltip.append(Translation.get("gb.isFork")).append("<br/>");

                add(icon);

            }

            if (model.useTickets) {

                JLabel icon = new JLabel(tixIcon);

                tooltip.append(Translation.get("gb.tickets")).append("<br/>");

                add(icon);

            }

            if (model.useDocs) {


 src/main/java/com/gitblit/models/RepositoryModel.java

@@ -51,7 +51,6 @@
    public String lastChangeAuthor;

    public boolean hasCommits;

    public boolean showRemoteBranches;

    public boolean useTickets;

    public boolean useDocs;

    public boolean useIncrementalPushTags;

    public String incrementalPushTagPrefix;

@@ -213,7 +212,6 @@
        clone.showRemoteBranches = false;

        clone.allowForks = false;

        clone.useDocs = useDocs;

        clone.useTickets = useTickets;

        clone.skipSizeCalculation = skipSizeCalculation;

        clone.skipSummaryMetrics = skipSummaryMetrics;

        clone.sparkleshareId = sparkleshareId;


 src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html

@@ -33,7 +33,6 @@
                <tr><th><wicket:message key="gb.gcPeriod"></wicket:message></th><td class="edit"><select class="span2" wicket:id="gcPeriod" tabindex="5" /> &nbsp;<span class="help-inline"><wicket:message key="gb.gcPeriodDescription"></wicket:message></span></td></tr>

                <tr><th><wicket:message key="gb.gcThreshold"></wicket:message></th><td class="edit"><input class="span1" type="text" wicket:id="gcThreshold" tabindex="6" /> &nbsp;<span class="help-inline"><wicket:message key="gb.gcThresholdDescription"></wicket:message></span></td></tr>

                <tr><th colspan="2"><hr/></th></tr>

                <tr><th><wicket:message key="gb.enableTickets"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="useTickets" tabindex="7" /> &nbsp;<span class="help-inline"><wicket:message key="gb.useTicketsDescription"></wicket:message></span></label></td></tr>

                <tr><th><wicket:message key="gb.enableDocs"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="useDocs" tabindex="8" /> &nbsp;<span class="help-inline"><wicket:message key="gb.useDocsDescription"></wicket:message></span></label></td></tr>

                <tr><th><wicket:message key="gb.enableIncrementalPushTags"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="useIncrementalPushTags" tabindex="8" /> &nbsp;<span class="help-inline"><wicket:message key="gb.useIncrementalPushTagsDescription"></wicket:message></span></label></td></tr>

                <tr><th><wicket:message key="gb.showRemoteBranches"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="showRemoteBranches" tabindex="9" /> &nbsp;<span class="help-inline"><wicket:message key="gb.showRemoteBranchesDescription"></wicket:message></span></label></td></tr>


 src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java

@@ -445,7 +445,6 @@
        }

        form.add(new DropDownChoice<FederationStrategy>("federationStrategy", federationStrategies,

                new FederationTypeRenderer()));

        form.add(new CheckBox("useTickets"));

        form.add(new CheckBox("useDocs"));

        form.add(new CheckBox("useIncrementalPushTags"));

        form.add(new CheckBox("showRemoteBranches"));


 src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html

@@ -89,7 +89,7 @@
        <td class="left" style="padding-left:3px;" ><b><span class="repositorySwatch" wicket:id="repositorySwatch"></span></b> <span style="padding-left:3px;" wicket:id="repositoryName">[repository name]</span></td>

        <td class="hidden-phone"><span class="list" wicket:id="repositoryDescription">[repository description]</span></td>

        <td class="hidden-tablet hidden-phone author"><span wicket:id="repositoryOwner">[repository owner]</span></td>

        <td class="hidden-phone" style="text-align: right;padding-right:10px;"><img class="inlineIcon" wicket:id="sparkleshareIcon" /><img class="inlineIcon" wicket:id="forkIcon" /><img class="inlineIcon" wicket:id="ticketsIcon" /><img class="inlineIcon" wicket:id="docsIcon" /><img class="inlineIcon" wicket:id="frozenIcon" /><img class="inlineIcon" wicket:id="federatedIcon" /><img class="inlineIcon" wicket:id="accessRestrictionIcon" /></td>

        <td class="hidden-phone" style="text-align: right;padding-right:10px;"><img class="inlineIcon" wicket:id="sparkleshareIcon" /><img class="inlineIcon" wicket:id="forkIcon" /><img class="inlineIcon" wicket:id="docsIcon" /><img class="inlineIcon" wicket:id="frozenIcon" /><img class="inlineIcon" wicket:id="federatedIcon" /><img class="inlineIcon" wicket:id="accessRestrictionIcon" /></td>

        <td><span wicket:id="repositoryLastChange">[last change]</span></td>

        <td class="hidden-phone" style="text-align: right;padding-right:15px;"><span style="font-size:0.8em;" wicket:id="repositorySize">[repository size]</span></td>

        <td class="rightAlign">


 src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java

@@ -250,13 +250,6 @@
                    row.add(WicketUtils.newClearPixel("forkIcon").setVisible(false));

                }



                if (entry.useTickets) {

                    row.add(WicketUtils.newImage("ticketsIcon", "bug_16x16.png",

                            getString("gb.tickets")));

                } else {

                    row.add(WicketUtils.newBlankImage("ticketsIcon"));

                }



                if (entry.useDocs) {

                    row.add(WicketUtils

                            .newImage("docsIcon", "book_16x16.png", getString("gb.docs")));


 src/test/java/com/gitblit/tests/GitBlitSuite.java

@@ -160,7 +160,6 @@
            cloneOrFetch("test/ambition.git", "https://github.com/defunkt/ambition.git");

            cloneOrFetch("test/gitective.git", "https://github.com/kevinsawicki/gitective.git");



            enableTickets("ticgit.git");

            enableDocs("ticgit.git");

            showRemoteBranches("ticgit.git");

            automaticallyTagBranchTips("ticgit.git");

@@ -182,16 +181,6 @@
            System.out.println("Error: " + t.getMessage());

        }

        System.out.println("done.");

    }



    private static void enableTickets(String repositoryName) {

        try {

            RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);

            model.useTickets = true;

            GitBlit.self().updateRepositoryModel(model.name, model, false);

        } catch (GitBlitException g) {

            g.printStackTrace();

        }

    }



    private static void enableDocs(String repositoryName) {