Projects >> portfolio >>391f67d828564c67848a5336c3cb69eb9f3b71c4

Chunk
Conflicting content 
        Entry section = new Entry(sidebar, Messages.ClientEditorLabelGeneralData);
        new Entry(section, new ActivateViewAction(Messages.LabelConsumerPriceIndex, "ConsumerPriceIndexList")) //$NON-NLS-1$
                        .setContextMenu(setAsStartPage);
<<<<<<< HEAD
        new Entry(section, new ActivateViewAction(Messages.LabelCurrencies, "ExchangeRatesList")) //$NON-NLS-1$
=======
        new Entry(section, new ActivateViewAction(Messages.BookmarksListView_title, "BookmarksList")) //$NON-NLS-1$
>>>>>>> 4c97147122569ae264832305a9a5bd0920c531e1
                        .setContextMenu(setAsStartPage);

        if ("yes".equals(System.getProperty("name.abuchen.portfolio.debug"))) //$NON-NLS-1$ //$NON-NLS-2$
Solution content 
        Entry section = new Entry(sidebar, Messages.ClientEditorLabelGeneralData);
        new Entry(section, new ActivateViewAction(Messages.LabelConsumerPriceIndex, "ConsumerPriceIndexList")) //$NON-NLS-1$
                        .setContextMenu(setAsStartPage);
        new Entry(section, new ActivateViewAction(Messages.LabelCurrencies, "ExchangeRatesList")) //$NON-NLS-1$
                        .setContextMenu(setAsStartPage);
        new Entry(section, new ActivateViewAction(Messages.BookmarksListView_title, "BookmarksList")) //$NON-NLS-1$
                        .setContextMenu(setAsStartPage);

        if ("yes".equals(System.getProperty("name.abuchen.portfolio.debug"))) //$NON-NLS-1$ //$NON-NLS-2$
File
ClientEditorSidebar.java
Developer's decision
Concatenation
Kind of conflict
Method invocation
Chunk
Conflicting content 
    public static String AccountMenuDeactivate;
    public static String AccountMenuDelete;
    public static String AccountMenuDeleteTransaction;
<<<<<<< HEAD
    public static String AccountMenuTransfer;
    public static String BaseCurrencyCue;
    public static String BaseCurrencyMigrationPage_Description;
    public static String BaseCurrencyMigrationPage_ExplanationIndividualCurrency;
    public static String BaseCurrencySelectionPage_Description;
    public static String BaseCurrencySelectionPage_ExplanationIndividualCurrency;
    public static String BaseCurrencySelectionPage_Title;
=======
    public static String AccountMenuTransfer;   
    public static String BookmarksListView_addSeparator;
    public static String BookmarksListView_insertAfter;
    public static String BookmarksListView_bookmark;
    public static String BookmarksListView_delete;
    public static String BookmarksListView_insertBefore;
    public static String BookmarksListView_NewBookmark;
    public static String BookmarksListView_title;
    public static String BookmarksListView_tooltip;
    public static String BookmarksListView_url;
>>>>>>> 4c97147122569ae264832305a9a5bd0920c531e1
    public static String BtnLabelRestartLater;
    public static String BtnLabelRestartNow;
    public static String CellEditor_NotANumber;
Solution content 
    public static String AccountMenuDeactivate;
    public static String AccountMenuDelete;
    public static String AccountMenuDeleteTransaction;
    public static String AccountMenuTransfer;
    public static String BaseCurrencyCue;
    public static String BaseCurrencyMigrationPage_Description;
    public static String BaseCurrencyMigrationPage_ExplanationIndividualCurrency;
    public static String BaseCurrencySelectionPage_Description;
    public static String BaseCurrencySelectionPage_ExplanationIndividualCurrency;
    public static String BaseCurrencySelectionPage_Title;
    public static String BookmarksListView_addSeparator;
    public static String BookmarksListView_insertAfter;
    public static String BookmarksListView_bookmark;
    public static String BookmarksListView_delete;
    public static String BookmarksListView_insertBefore;
    public static String BookmarksListView_NewBookmark;
    public static String BookmarksListView_title;
    public static String BookmarksListView_tooltip;
    public static String BookmarksListView_url;
    public static String BtnLabelRestartLater;
    public static String BtnLabelRestartNow;
    public static String CellEditor_NotANumber;
File
Messages.java
Developer's decision
Combination
Kind of conflict
Attribute
Chunk
Conflicting content 
import name.abuchen.portfolio.model.Security;
import name.abuchen.portfolio.ui.AbstractFinanceView;
import name.abuchen.portfolio.ui.Messages;
<<<<<<< HEAD
import name.abuchen.portfolio.ui.dialogs.transactions.AccountTransactionDialog;
import name.abuchen.portfolio.ui.dialogs.transactions.OpenDialogAction;
import name.abuchen.portfolio.ui.dialogs.transactions.SecurityTransactionDialog;
import name.abuchen.portfolio.ui.dialogs.transactions.SecurityTransferDialog;
import name.abuchen.portfolio.ui.util.WebLocationMenu;
=======
import name.abuchen.portfolio.ui.dialogs.BuySellSecurityDialog;
import name.abuchen.portfolio.ui.dialogs.SecurityAccountTransactionDialog;
import name.abuchen.portfolio.ui.dialogs.SecurityDeliveryDialog;
import name.abuchen.portfolio.ui.dialogs.SecurityTransferDialog;
import name.abuchen.portfolio.ui.util.BookmarkMenu;
>>>>>>> 4c97147122569ae264832305a9a5bd0920c531e1
import name.abuchen.portfolio.ui.wizards.splits.StockSplitWizard;

import org.eclipse.jface.action.Action;
Solution content 
import name.abuchen.portfolio.model.Security;
import name.abuchen.portfolio.ui.AbstractFinanceView;
import name.abuchen.portfolio.ui.Messages;
import name.abuchen.portfolio.ui.dialogs.transactions.AccountTransactionDialog;
import name.abuchen.portfolio.ui.dialogs.transactions.OpenDialogAction;
import name.abuchen.portfolio.ui.dialogs.transactions.SecurityTransactionDialog;
import name.abuchen.portfolio.ui.dialogs.transactions.SecurityTransferDialog;
import name.abuchen.portfolio.ui.util.BookmarkMenu;
import name.abuchen.portfolio.ui.wizards.splits.StockSplitWizard;

import org.eclipse.jface.action.Action;
File
SecurityContextMenu.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
{
    /* package */static final int MAJOR_VERSION = 1;
    /* package */static final int CURRENT_VERSION = 27;
<<<<<<< HEAD

    public static final int VERSION_WITH_CURRENCY_SUPPORT = 27;
=======
>>>>>>> 4c97147122569ae264832305a9a5bd0920c531e1

    private transient PropertyChangeSupport propertyChangeSupport;
Solution content 
{
    /* package */static final int MAJOR_VERSION = 1;
    /* package */static final int CURRENT_VERSION = 28;

    public static final int VERSION_WITH_CURRENCY_SUPPORT = 28;

    private transient PropertyChangeSupport propertyChangeSupport;
File
Client.java
Developer's decision
Manual
Kind of conflict
Attribute
Chunk
Conflicting content 
    private List plans;
    private List taxonomies;

<<<<<<< HEAD
    private Map properties;
=======
    private Map properties; // old versions!
    private ClientSettings settings;
>>>>>>> 4c97147122569ae264832305a9a5bd0920c531e1

    @Deprecated
    private String industryTaxonomyId;
Solution content 
    private List plans;
    private List taxonomies;

    private Map properties;
    private ClientSettings settings;

    @Deprecated
    private String industryTaxonomyId;
File
Client.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
                // sign
                incrementSharesPrecisionFromFiveToSixDigitsAfterDecimalSign(client);
            case 26:
<<<<<<< HEAD
                // added currency support --> designate a default currency (user
                // will get a dialog to change)
                setAllCurrencies(client, CurrencyUnit.EUR);
=======
                // do nothing --> added client settings
>>>>>>> 4c97147122569ae264832305a9a5bd0920c531e1
                client.setVersion(Client.CURRENT_VERSION);
                break;
            case Client.CURRENT_VERSION:
Solution content 
                // sign
                incrementSharesPrecisionFromFiveToSixDigitsAfterDecimalSign(client);
            case 26:
                // do nothing --> added client settings
            case 27:
                // added currency support --> designate a default currency (user
                // will get a dialog to change)
                setAllCurrencies(client, CurrencyUnit.EUR);
                client.setVersion(Client.CURRENT_VERSION);
                break;
            case Client.CURRENT_VERSION:
File
ClientFactory.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation