Projects >> XCoLab >>542f79dcf7f67f8d0609c04845427993d3254825

Chunk
Conflicting content 
                "com.liferay.portal.service.ServiceContext"
            };

<<<<<<< HEAD
        _methodName63 = "getAdvisorsForContest";

        _methodParameterTypes63 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName64 = "getJudgesForContest";

        _methodParameterTypes64 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName65 = "getFellowsForContest";

        _methodParameterTypes65 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName66 = "getContestManagersForContest";
=======
        _methodName65 = "getJudgesForContest";

        _methodParameterTypes65 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName66 = "getFellowsForContest";
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77

        _methodParameterTypes66 = new String[] { "com.ext.portlet.model.Contest" };
Solution content 
                "com.liferay.portal.service.ServiceContext"
            };

        _methodName65 = "getAdvisorsForContest";

        _methodParameterTypes65 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName66 = "getJudgesForContest";

        _methodParameterTypes66 = new String[] { "com.ext.portlet.model.Contest" };
File
ContestLocalServiceClp.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
    private String[] _methodParameterTypes14;
    private String _methodName15;
    private String[] _methodParameterTypes15;
<<<<<<< HEAD
=======
    private String _methodName576;
    private String[] _methodParameterTypes576;
    private String _methodName577;
    private String[] _methodParameterTypes577;
    private String _methodName583;
    private String[] _methodParameterTypes583;
    private String _methodName584;
    private String[] _methodParameterTypes584;
    private String _methodName585;
    private String[] _methodParameterTypes585;
    private String _methodName586;
    private String[] _methodParameterTypes586;
    private String _methodName587;
    private String[] _methodParameterTypes587;
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
    private String _methodName588;
    private String[] _methodParameterTypes588;
    private String _methodName589;
Solution content 
    private String[] _methodParameterTypes14;
    private String _methodName15;
    private String[] _methodParameterTypes15;
    private String _methodName588;
    private String[] _methodParameterTypes588;
    private String _methodName589;
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
    private String[] _methodParameterTypes601;
    private String _methodName602;
    private String[] _methodParameterTypes602;
<<<<<<< HEAD
    private String _methodName603;
    private String[] _methodParameterTypes603;
    private String _methodName604;
    private String[] _methodParameterTypes604;
    private String _methodName605;
    private String[] _methodParameterTypes605;
    private String _methodName606;
    private String[] _methodParameterTypes606;
    private String _methodName607;
    private String[] _methodParameterTypes607;
    private String _methodName608;
    private String[] _methodParameterTypes608;
    private String _methodName609;
    private String[] _methodParameterTypes609;
    private String _methodName610;
    private String[] _methodParameterTypes610;
    private String _methodName611;
    private String[] _methodParameterTypes611;
    private String _methodName612;
    private String[] _methodParameterTypes612;
    private String _methodName613;
    private String[] _methodParameterTypes613;
    private String _methodName614;
    private String[] _methodParameterTypes614;
=======
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77

    public ActivitySubscriptionLocalServiceClpInvoker() {
        _methodName0 = "addActivitySubscription";
Solution content 
    private String _methodName613;
    private String[] _methodParameterTypes613;
    private String _methodName614;
    private String[] _methodParameterTypes614;

    public ActivitySubscriptionLocalServiceClpInvoker() {
    private String[] _methodParameterTypes601;
    private String _methodName602;
    private String[] _methodParameterTypes602;
    private String _methodName603;
    private String[] _methodParameterTypes603;
    private String _methodName604;
    private String[] _methodParameterTypes604;
    private String _methodName605;
    private String[] _methodParameterTypes605;
    private String _methodName606;
    private String[] _methodParameterTypes606;
    private String _methodName607;
    private String[] _methodParameterTypes607;
    private String _methodName608;
    private String[] _methodParameterTypes608;
    private String _methodName609;
    private String[] _methodParameterTypes609;
    private String _methodName610;
    private String[] _methodParameterTypes610;
    private String _methodName611;
    private String[] _methodParameterTypes611;
    private String _methodName612;
    private String[] _methodParameterTypes612;
        _methodName0 = "addActivitySubscription";
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
        _methodParameterTypes589 = new String[] { "java.lang.String" };

<<<<<<< HEAD
        _methodName595 = "getActivitySubscriptions";

        _methodParameterTypes595 = new String[] {
=======
        _methodName583 = "getActivitySubscriptions";

        _methodParameterTypes583 = new String[] {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
                "java.lang.Class", "java.lang.Long", "java.lang.Integer",
                "java.lang.String"
            };
Solution content 
        _methodParameterTypes589 = new String[] { "java.lang.String" };

        _methodName595 = "getActivitySubscriptions";

        _methodParameterTypes595 = new String[] {
                "java.lang.Class", "java.lang.Long", "java.lang.Integer",
                "java.lang.String"
            };
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
                "java.lang.String"
            };

<<<<<<< HEAD
        _methodName596 = "findByUser";

        _methodParameterTypes596 = new String[] { "java.lang.Long" };

        _methodName597 = "isSubscribed";

        _methodParameterTypes597 = new String[] {
                "java.lang.Long", "java.lang.Long", "java.lang.Long",
                "java.lang.Integer", "java.lang.String"
            };
=======
        _methodName584 = "findByUser";

        _methodParameterTypes584 = new String[] { "java.lang.Long" };
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77

        _methodName598 = "isSubscribed";
Solution content 
                "java.lang.String"
            };

        _methodName596 = "findByUser";

        _methodParameterTypes596 = new String[] { "java.lang.Long" };

        _methodName597 = "isSubscribed";

        _methodParameterTypes597 = new String[] {
                "java.lang.Long", "java.lang.Long", "java.lang.Long",
                "java.lang.Integer", "java.lang.String"
            };

        _methodName598 = "isSubscribed";
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        _methodName598 = "isSubscribed";

<<<<<<< HEAD
        _methodParameterTypes598 = new String[] {
                "java.lang.Long", "java.lang.Class", "java.lang.Long",
                "java.lang.Integer", "java.lang.String"
            };

        _methodName599 = "deleteSubscription";

        _methodParameterTypes599 = new String[] {
                "java.lang.Long", "java.lang.Long", "java.lang.Long",
=======
        _methodParameterTypes585 = new String[] {
                "java.lang.Long", "java.lang.Long", "java.lang.Long",
                "java.lang.Integer", "java.lang.String"
            };

        _methodName586 = "isSubscribed";

        _methodParameterTypes586 = new String[] {
                "java.lang.Long", "java.lang.Class", "java.lang.Long",
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
                "java.lang.Integer", "java.lang.String"
            };
Solution content 
        _methodName598 = "isSubscribed";

        _methodParameterTypes598 = new String[] {
                "java.lang.Long", "java.lang.Class", "java.lang.Long",
                "java.lang.Integer", "java.lang.String"
            };

        _methodName599 = "deleteSubscription";

        _methodParameterTypes599 = new String[] {
                "java.lang.Long", "java.lang.Long", "java.lang.Long",
                "java.lang.Integer", "java.lang.String"
            };
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        _methodName601 = "deleteSubscription";

<<<<<<< HEAD
        _methodParameterTypes601 = new String[] {
                "java.lang.Long", "java.lang.Class", "java.lang.Long",
=======
        _methodParameterTypes588 = new String[] {
                "java.lang.Long", "java.lang.Long", "java.lang.Long",
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
                "java.lang.Integer", "java.lang.String", "boolean"
            };
Solution content 
        _methodName601 = "deleteSubscription";

        _methodParameterTypes601 = new String[] {
                "java.lang.Long", "java.lang.Class", "java.lang.Long",
                "java.lang.Integer", "java.lang.String", "boolean"
            };
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
                "java.lang.Integer", "java.lang.String", "boolean"
            };

<<<<<<< HEAD
        _methodName603 = "addSubscription";

        _methodParameterTypes603 = new String[] {
                "java.lang.Long", "java.lang.Long", "java.lang.Integer",
                "java.lang.String", "java.lang.Long"
=======
        _methodName590 = "deleteSubscription";

        _methodParameterTypes590 = new String[] {
                "java.lang.Long", "java.lang.Class", "java.lang.Long",
                "java.lang.Integer", "java.lang.String"
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            };

        _methodName604 = "addSubscription";
Solution content 
            };

        _methodName603 = "addSubscription";

        _methodParameterTypes603 = new String[] {
                "java.lang.Long", "java.lang.Long", "java.lang.Integer",
                "java.lang.String", "java.lang.Long"
            };

        _methodName604 = "addSubscription";
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        _methodName605 = "addSubscription";

<<<<<<< HEAD
        _methodParameterTypes605 = new String[] {
                "java.lang.Class", "java.lang.Long", "java.lang.Integer",
                "java.lang.String", "java.lang.Long"
=======
        _methodParameterTypes592 = new String[] {
                "java.lang.Long", "java.lang.Long", "java.lang.Integer",
                "java.lang.String", "java.lang.Long", "boolean"
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            };

        _methodName606 = "addSubscription";
Solution content 
        _methodName605 = "addSubscription";

        _methodParameterTypes605 = new String[] {
                "java.lang.Class", "java.lang.Long", "java.lang.Integer",
                "java.lang.String", "java.lang.Long"
            };

        _methodName606 = "addSubscription";
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
                "java.lang.String", "java.lang.Long"
            };

<<<<<<< HEAD
        _methodName607 = "getActivities";

        _methodParameterTypes607 = new String[] { "java.lang.Long", "int", "int" };

        _methodName608 = "store";

        _methodParameterTypes608 = new String[] {
                "com.ext.portlet.model.ActivitySubscription"
            };

        _methodName609 = "getName";
=======
        _methodName594 = "addSubscription";

        _methodParameterTypes594 = new String[] {
                "java.lang.Class", "java.lang.Long", "java.lang.Integer",
                "java.lang.String", "java.lang.Long", "boolean"
            };

        _methodName595 = "getActivities";

        _methodParameterTypes595 = new String[] { "java.lang.Long", "int", "int" };

        _methodName596 = "store";
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77

        _methodParameterTypes609 = new String[] {
                "com.ext.portlet.model.ActivitySubscription"
Solution content 
            };

        _methodName607 = "getActivities";

        _methodParameterTypes607 = new String[] { "java.lang.Long", "int", "int" };

        _methodName608 = "store";

        _methodParameterTypes608 = new String[] {
                "com.ext.portlet.model.ActivitySubscription"
            };

        _methodName609 = "getName";

        _methodParameterTypes609 = new String[] {
                "com.ext.portlet.model.ActivitySubscription"
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
                "com.ext.portlet.model.ActivitySubscription"
            };

<<<<<<< HEAD
        _methodName610 = "getSubscriptionType";
=======
        _methodName597 = "getName";
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77

        _methodParameterTypes610 = new String[] {
                "com.ext.portlet.model.ActivitySubscription"
Solution content 
                "com.ext.portlet.model.ActivitySubscription"
            };

        _methodName610 = "getSubscriptionType";

        _methodParameterTypes610 = new String[] {
                "com.ext.portlet.model.ActivitySubscription"
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
                "com.ext.portlet.model.ActivitySubscription"
            };

<<<<<<< HEAD
        _methodName611 = "delete";
=======
        _methodName598 = "getSubscriptionType";
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77

        _methodParameterTypes611 = new String[] {
                "com.ext.portlet.model.ActivitySubscription"
Solution content 
                "com.ext.portlet.model.ActivitySubscription"
            };

        _methodName611 = "delete";

        _methodParameterTypes611 = new String[] {
                "com.ext.portlet.model.ActivitySubscription"
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
                "com.ext.portlet.model.ActivitySubscription"
            };

<<<<<<< HEAD
        _methodName612 = "sendEmailNotifications";

        _methodParameterTypes612 = new String[] {
                "com.liferay.portal.service.ServiceContext"
            };

        _methodName613 = "getSubscribedUsers";

        _methodParameterTypes613 = new String[] { "java.lang.Class", "long" };
=======
        _methodName599 = "delete";

        _methodParameterTypes599 = new String[] {
                "com.ext.portlet.model.ActivitySubscription"
            };

        _methodName600 = "sendEmailNotifications";

        _methodParameterTypes600 = new String[] {
                "com.liferay.portal.service.ServiceContext"
            };
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77

        _methodName614 = "getSubscribedUsers";
Solution content 
                "com.ext.portlet.model.ActivitySubscription"
            };

        _methodName612 = "sendEmailNotifications";

        _methodParameterTypes612 = new String[] {
                "com.liferay.portal.service.ServiceContext"
            };

        _methodName613 = "getSubscribedUsers";

        _methodParameterTypes613 = new String[] { "java.lang.Class", "long" };

        _methodName614 = "getSubscribedUsers";
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        _methodName614 = "getSubscribedUsers";

<<<<<<< HEAD
        _methodParameterTypes614 = new String[] { "long", "long" };
=======
        _methodParameterTypes601 = new String[] { "java.lang.Class", "long" };

        _methodName602 = "getSubscribedUsers";

        _methodParameterTypes602 = new String[] { "long", "long" };
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
    }

    public Object invokeMethod(String name, String[] parameterTypes,
Solution content 
        _methodName614 = "getSubscribedUsers";

        _methodParameterTypes614 = new String[] { "long", "long" };
    }

    public Object invokeMethod(String name, String[] parameterTypes,
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
            return null;
        }

<<<<<<< HEAD
        if (_methodName595.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes595, parameterTypes)) {
=======
        if (_methodName583.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes583, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            return ActivitySubscriptionLocalServiceUtil.getActivitySubscriptions((java.lang.Class) arguments[0],
                (java.lang.Long) arguments[1],
                (java.lang.Integer) arguments[2],
Solution content 
            return null;
        }

        if (_methodName595.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes595, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.getActivitySubscriptions((java.lang.Class) arguments[0],
                (java.lang.Long) arguments[1],
                (java.lang.Integer) arguments[2],
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
                (java.lang.String) arguments[3]);
        }

<<<<<<< HEAD
        if (_methodName596.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes596, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.findByUser((java.lang.Long) arguments[0]);
        }

        if (_methodName597.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes597, parameterTypes)) {
=======
        if (_methodName584.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes584, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.findByUser((java.lang.Long) arguments[0]);
        }

        if (_methodName585.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes585, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            return ActivitySubscriptionLocalServiceUtil.isSubscribed((java.lang.Long) arguments[0],
                (java.lang.Long) arguments[1], (java.lang.Long) arguments[2],
                (java.lang.Integer) arguments[3],
Solution content 
                (java.lang.String) arguments[3]);
        }

        if (_methodName596.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes596, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.findByUser((java.lang.Long) arguments[0]);
        }

        if (_methodName597.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes597, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.isSubscribed((java.lang.Long) arguments[0],
                (java.lang.Long) arguments[1], (java.lang.Long) arguments[2],
                (java.lang.Integer) arguments[3],
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
                (java.lang.String) arguments[4]);
        }

<<<<<<< HEAD
        if (_methodName598.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes598, parameterTypes)) {
=======
        if (_methodName586.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes586, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            return ActivitySubscriptionLocalServiceUtil.isSubscribed((java.lang.Long) arguments[0],
                (java.lang.Class) arguments[1], (java.lang.Long) arguments[2],
                (java.lang.Integer) arguments[3],
Solution content 
                (java.lang.String) arguments[4]);
        }

        if (_methodName598.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes598, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.isSubscribed((java.lang.Long) arguments[0],
                (java.lang.Class) arguments[1], (java.lang.Long) arguments[2],
                (java.lang.Integer) arguments[3],
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
                (java.lang.String) arguments[4]);
        }

<<<<<<< HEAD
        if (_methodName599.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes599, parameterTypes)) {
=======
        if (_methodName587.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes587, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            ActivitySubscriptionLocalServiceUtil.deleteSubscription((java.lang.Long) arguments[0],
                (java.lang.Long) arguments[1], (java.lang.Long) arguments[2],
                (java.lang.Integer) arguments[3],
Solution content 
                (java.lang.String) arguments[4]);
        }

        if (_methodName599.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes599, parameterTypes)) {
            ActivitySubscriptionLocalServiceUtil.deleteSubscription((java.lang.Long) arguments[0],
                (java.lang.Long) arguments[1], (java.lang.Long) arguments[2],
                (java.lang.Integer) arguments[3],
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
            return null;
        }

<<<<<<< HEAD
        if (_methodName600.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes600, parameterTypes)) {
=======
        if (_methodName588.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes588, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            ActivitySubscriptionLocalServiceUtil.deleteSubscription((java.lang.Long) arguments[0],
                (java.lang.Long) arguments[1], (java.lang.Long) arguments[2],
                (java.lang.Integer) arguments[3],
Solution content 
            return null;
        }

        if (_methodName600.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes600, parameterTypes)) {
            ActivitySubscriptionLocalServiceUtil.deleteSubscription((java.lang.Long) arguments[0],
                (java.lang.Long) arguments[1], (java.lang.Long) arguments[2],
                (java.lang.Integer) arguments[3],
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
            return null;
        }

<<<<<<< HEAD
        if (_methodName601.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes601, parameterTypes)) {
=======
        if (_methodName589.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes589, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            ActivitySubscriptionLocalServiceUtil.deleteSubscription((java.lang.Long) arguments[0],
                (java.lang.Class) arguments[1], (java.lang.Long) arguments[2],
                (java.lang.Integer) arguments[3],
Solution content 
            return null;
        }

        if (_methodName601.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes601, parameterTypes)) {
            ActivitySubscriptionLocalServiceUtil.deleteSubscription((java.lang.Long) arguments[0],
                (java.lang.Class) arguments[1], (java.lang.Long) arguments[2],
                (java.lang.Integer) arguments[3],
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
            return null;
        }

<<<<<<< HEAD
        if (_methodName602.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes602, parameterTypes)) {
=======
        if (_methodName590.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes590, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            ActivitySubscriptionLocalServiceUtil.deleteSubscription((java.lang.Long) arguments[0],
                (java.lang.Class) arguments[1], (java.lang.Long) arguments[2],
                (java.lang.Integer) arguments[3],
Solution content 
            return null;
        }

        if (_methodName602.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes602, parameterTypes)) {
            ActivitySubscriptionLocalServiceUtil.deleteSubscription((java.lang.Long) arguments[0],
                (java.lang.Class) arguments[1], (java.lang.Long) arguments[2],
                (java.lang.Integer) arguments[3],
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
                (java.lang.Integer) arguments[2],
            return null;
        }

<<<<<<< HEAD
        if (_methodName603.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes603, parameterTypes)) {
=======
        if (_methodName591.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes591, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            ActivitySubscriptionLocalServiceUtil.addSubscription((java.lang.Long) arguments[0],
                (java.lang.Long) arguments[1],
Solution content 
            return null;
        }

        if (_methodName603.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes603, parameterTypes)) {
            ActivitySubscriptionLocalServiceUtil.addSubscription((java.lang.Long) arguments[0],
                (java.lang.Long) arguments[1],
                (java.lang.Integer) arguments[2],
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
            return null;
        }

<<<<<<< HEAD
        if (_methodName604.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes604, parameterTypes)) {
=======
        if (_methodName592.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes592, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            ActivitySubscriptionLocalServiceUtil.addSubscription((java.lang.Long) arguments[0],
                (java.lang.Long) arguments[1],
                (java.lang.Integer) arguments[2],
Solution content 
            return null;
        }
        if (_methodName604.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes604, parameterTypes)) {
            ActivitySubscriptionLocalServiceUtil.addSubscription((java.lang.Long) arguments[0],
                (java.lang.Long) arguments[1],
                (java.lang.Integer) arguments[2],
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
            return null;
        }

<<<<<<< HEAD
        if (_methodName605.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes605, parameterTypes)) {
=======
        if (_methodName593.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes593, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            ActivitySubscriptionLocalServiceUtil.addSubscription((java.lang.Class) arguments[0],
                (java.lang.Long) arguments[1],
                (java.lang.Integer) arguments[2],
Solution content 
            return null;
        }

        if (_methodName605.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes605, parameterTypes)) {
            ActivitySubscriptionLocalServiceUtil.addSubscription((java.lang.Class) arguments[0],
                (java.lang.Long) arguments[1],
                (java.lang.Integer) arguments[2],
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
            return null;
        }

<<<<<<< HEAD
        if (_methodName606.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes606, parameterTypes)) {
=======
        if (_methodName594.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes594, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            ActivitySubscriptionLocalServiceUtil.addSubscription((java.lang.Class) arguments[0],
                (java.lang.Long) arguments[1],
                (java.lang.Integer) arguments[2],
Solution content 
            return null;
        }

        if (_methodName606.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes606, parameterTypes)) {
            ActivitySubscriptionLocalServiceUtil.addSubscription((java.lang.Class) arguments[0],
                (java.lang.Long) arguments[1],
                (java.lang.Integer) arguments[2],
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
            return null;
        }

<<<<<<< HEAD
        if (_methodName607.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes607, parameterTypes)) {
=======
        if (_methodName595.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes595, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            return ActivitySubscriptionLocalServiceUtil.getActivities((java.lang.Long) arguments[0],
                ((Integer) arguments[1]).intValue(),
                ((Integer) arguments[2]).intValue());
Solution content 
            return null;
        }

        if (_methodName607.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes607, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.getActivities((java.lang.Long) arguments[0],
                ((Integer) arguments[1]).intValue(),
                ((Integer) arguments[2]).intValue());
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
                ((Integer) arguments[2]).intValue());
        }

<<<<<<< HEAD
        if (_methodName608.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes608, parameterTypes)) {
=======
        if (_methodName596.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes596, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            ActivitySubscriptionLocalServiceUtil.store((com.ext.portlet.model.ActivitySubscription) arguments[0]);

            return null;
Solution content 
                ((Integer) arguments[2]).intValue());
        }

        if (_methodName608.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes608, parameterTypes)) {
            ActivitySubscriptionLocalServiceUtil.store((com.ext.portlet.model.ActivitySubscription) arguments[0]);

            return null;
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
            return null;
        }

<<<<<<< HEAD
        if (_methodName609.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes609, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.getName((com.ext.portlet.model.ActivitySubscription) arguments[0]);
        }

        if (_methodName610.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes610, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.getSubscriptionType((com.ext.portlet.model.ActivitySubscription) arguments[0]);
        }

        if (_methodName611.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes611, parameterTypes)) {
            ActivitySubscriptionLocalServiceUtil.delete((com.ext.portlet.model.ActivitySubscription) arguments[0]);

            return null;
        }

        if (_methodName612.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes612, parameterTypes)) {
            ActivitySubscriptionLocalServiceUtil.sendEmailNotifications((com.liferay.portal.service.ServiceContext) arguments[0]);
=======
        if (_methodName597.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes597, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.getName((com.ext.portlet.model.ActivitySubscription) arguments[0]);
        }

        if (_methodName598.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes598, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.getSubscriptionType((com.ext.portlet.model.ActivitySubscription) arguments[0]);
        }

        if (_methodName599.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes599, parameterTypes)) {
            ActivitySubscriptionLocalServiceUtil.delete((com.ext.portlet.model.ActivitySubscription) arguments[0]);
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77

            return null;
        }
Solution content 
            return null;
        }

        if (_methodName609.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes609, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.getName((com.ext.portlet.model.ActivitySubscription) arguments[0]);
        }

        if (_methodName610.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes610, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.getSubscriptionType((com.ext.portlet.model.ActivitySubscription) arguments[0]);
        }

        if (_methodName611.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes611, parameterTypes)) {
            ActivitySubscriptionLocalServiceUtil.delete((com.ext.portlet.model.ActivitySubscription) arguments[0]);

            return null;
        }

        if (_methodName612.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes612, parameterTypes)) {
            ActivitySubscriptionLocalServiceUtil.sendEmailNotifications((com.liferay.portal.service.ServiceContext) arguments[0]);

            return null;
        }
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
            return null;
        }

<<<<<<< HEAD
        if (_methodName613.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes613, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.getSubscribedUsers((java.lang.Class) arguments[0],
                ((Long) arguments[1]).longValue());
        }

        if (_methodName614.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes614, parameterTypes)) {
=======
        if (_methodName600.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes600, parameterTypes)) {
            ActivitySubscriptionLocalServiceUtil.sendEmailNotifications((com.liferay.portal.service.ServiceContext) arguments[0]);

            return null;
        }

        if (_methodName601.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes601, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.getSubscribedUsers((java.lang.Class) arguments[0],
                ((Long) arguments[1]).longValue());
        }

        if (_methodName602.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes602, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            return ActivitySubscriptionLocalServiceUtil.getSubscribedUsers(((Long) arguments[0]).longValue(),
                ((Long) arguments[1]).longValue());
        }
Solution content 
            return null;
        }

        if (_methodName613.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes613, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.getSubscribedUsers((java.lang.Class) arguments[0],
                ((Long) arguments[1]).longValue());
        }

        if (_methodName614.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes614, parameterTypes)) {
            return ActivitySubscriptionLocalServiceUtil.getSubscribedUsers(((Long) arguments[0]).longValue(),
                ((Long) arguments[1]).longValue());
        }
File
ActivitySubscriptionLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
    private String[] _methodParameterTypes628;
    private String _methodName629;
    private String[] _methodParameterTypes629;
<<<<<<< HEAD
    private String _methodName630;
    private String[] _methodParameterTypes630;
=======
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
    private String _methodName631;
    private String[] _methodParameterTypes631;
    private String _methodName632;
Solution content 
    private String[] _methodParameterTypes628;
    private String _methodName629;
    private String[] _methodParameterTypes629;
    private String _methodName630;
    private String[] _methodParameterTypes630;
    private String _methodName631;
    private String[] _methodParameterTypes631;
    private String _methodName632;
File
ContestLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
    private String[] _methodParameterTypes631;
    private String _methodName632;
    private String[] _methodParameterTypes632;
<<<<<<< HEAD
    private String _methodName633;
    private String[] _methodParameterTypes633;
    private String _methodName634;
    private String[] _methodParameterTypes634;
    private String _methodName636;
    private String[] _methodParameterTypes636;
    private String _methodName637;
    private String[] _methodParameterTypes637;
=======
    private String _methodName635;
    private String[] _methodParameterTypes635;
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
    private String _methodName638;
    private String[] _methodParameterTypes638;
    private String _methodName639;
Solution content 
    private String[] _methodParameterTypes631;
    private String _methodName632;
    private String[] _methodParameterTypes632;
    private String _methodName633;
    private String[] _methodParameterTypes633;
    private String _methodName634;
    private String[] _methodParameterTypes634;
    private String _methodName636;
    private String[] _methodParameterTypes636;
    private String _methodName637;
    private String[] _methodParameterTypes637;
    private String _methodName638;
    private String[] _methodParameterTypes638;
    private String _methodName639;
File
ContestLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
    private String[] _methodParameterTypes638;
    private String _methodName639;
    private String[] _methodParameterTypes639;
<<<<<<< HEAD
    private String _methodName641;
    private String[] _methodParameterTypes641;
    private String _methodName642;
    private String[] _methodParameterTypes642;
    private String _methodName643;
    private String[] _methodParameterTypes643;
    private String _methodName644;
    private String[] _methodParameterTypes644;
    private String _methodName647;
    private String[] _methodParameterTypes647;
    private String _methodName650;
    private String[] _methodParameterTypes650;
    private String _methodName651;
    private String[] _methodParameterTypes651;
    private String _methodName652;
    private String[] _methodParameterTypes652;
    private String _methodName653;
    private String[] _methodParameterTypes653;
=======
    private String _methodName640;
    private String[] _methodParameterTypes640;
    private String _methodName641;
    private String[] _methodParameterTypes641;
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77

    public ContestLocalServiceClpInvoker() {
        _methodName0 = "addContest";
Solution content 
    private String[] _methodParameterTypes638;
    private String _methodName639;
    private String[] _methodParameterTypes639;
    private String _methodName640;
    private String[] _methodParameterTypes640;
    private String _methodName641;
    private String[] _methodParameterTypes641;
    private String _methodName643;
    private String[] _methodParameterTypes643;
    private String _methodName644;
    private String[] _methodParameterTypes644;
    private String _methodName645;
    private String[] _methodParameterTypes645;
    private String _methodName646;
    private String[] _methodParameterTypes646;
    private String _methodName649;
    private String[] _methodParameterTypes649;
    private String _methodName652;
    private String[] _methodParameterTypes652;
    private String _methodName653;
    private String[] _methodParameterTypes653;
    private String _methodName654;
    private String[] _methodParameterTypes654;
    private String _methodName655;
    private String[] _methodParameterTypes655;

    public ContestLocalServiceClpInvoker() {
        _methodName0 = "addContest";
File
ContestLocalServiceClpInvoker.java
Developer's decision
Manual
Kind of conflict
Attribute
Chunk
Conflicting content 
        _methodParameterTypes637 = new String[] { "java.util.List" };

<<<<<<< HEAD
        _methodName638 = "transferSupportsToVote";

        _methodParameterTypes638 = new String[] {
=======
        _methodName626 = "getContestsMatchingTier";

        _methodParameterTypes626 = new String[] { "long" };

        _methodName627 = "getContestsMatchingOntologyTermsAndTier";

        _methodParameterTypes627 = new String[] { "java.util.List", "long" };

        _methodName628 = "transferSupportsToVote";

        _methodParameterTypes628 = new String[] {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
                "com.ext.portlet.model.Contest",
                "com.liferay.portal.service.ServiceContext"
            };
Solution content 
        _methodParameterTypes637 = new String[] { "java.util.List" };

        _methodName638 = "getContestsMatchingTier";

        _methodParameterTypes638 = new String[] { "long" };

        _methodName639 = "getContestsMatchingOntologyTermsAndTier";

        _methodParameterTypes639 = new String[] { "java.util.List", "long" };

        _methodName640 = "transferSupportsToVote";

        _methodParameterTypes640 = new String[] {
                "com.ext.portlet.model.Contest",
                "com.liferay.portal.service.ServiceContext"
            };
File
ContestLocalServiceClpInvoker.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
                "com.liferay.portal.service.ServiceContext"
            };

<<<<<<< HEAD
        _methodName639 = "getProposalJudgeReviewCsv";

        _methodParameterTypes639 = new String[] {
=======
        _methodName629 = "getProposalJudgeReviewCsv";

        _methodParameterTypes629 = new String[] {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
                "com.ext.portlet.model.Contest",
                "com.ext.portlet.model.ContestPhase",
                "com.liferay.portal.service.ServiceContext"
Solution content 
                "com.liferay.portal.service.ServiceContext"
            };

        _methodName641 = "getProposalJudgeReviewCsv";

        _methodParameterTypes641 = new String[] {
                "com.ext.portlet.model.Contest",
                "com.ext.portlet.model.ContestPhase",
                "com.liferay.portal.service.ServiceContext"
File
ContestLocalServiceClpInvoker.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
                "com.liferay.portal.service.ServiceContext"
            };

<<<<<<< HEAD
        _methodName641 = "getAdvisorsForContest";

        _methodParameterTypes641 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName642 = "getJudgesForContest";

        _methodParameterTypes642 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName643 = "getFellowsForContest";

        _methodParameterTypes643 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName644 = "getContestManagersForContest";

        _methodParameterTypes644 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName647 = "getContestLinkUrl";

        _methodParameterTypes647 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName650 = "hasContestEnded";

        _methodParameterTypes650 = new String[] { "long" };

        _methodName651 = "hasContestEnded";

        _methodParameterTypes651 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName652 = "getWinnerProposal";

        _methodParameterTypes652 = new String[] { "long" };

        _methodName653 = "getPointsAccessibleForActivePhaseOfContest";

        _methodParameterTypes653 = new String[] { "com.ext.portlet.model.Contest" };
=======
        _methodName631 = "getJudgesForContest";
        _methodParameterTypes631 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName632 = "getFellowsForContest";

        _methodParameterTypes632 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName635 = "getContestLinkUrl";

        _methodParameterTypes635 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName638 = "hasContestEnded";

        _methodParameterTypes638 = new String[] { "long" };

        _methodName639 = "hasContestEnded";

        _methodParameterTypes639 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName640 = "getWinnerProposal";

        _methodParameterTypes640 = new String[] { "long" };

        _methodName641 = "getPointsAccessibleForActivePhaseOfContest";

        _methodParameterTypes641 = new String[] { "com.ext.portlet.model.Contest" };
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
    }

    public Object invokeMethod(String name, String[] parameterTypes,
Solution content 
                "com.liferay.portal.service.ServiceContext"
            };

        _methodName643 = "getAdvisorsForContest";

        _methodParameterTypes643 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName644 = "getJudgesForContest";

        _methodParameterTypes644 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName645 = "getFellowsForContest";

        _methodParameterTypes645 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName646 = "getContestManagersForContest";

        _methodParameterTypes646 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName649 = "getContestLinkUrl";

        _methodParameterTypes649 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName652 = "hasContestEnded";

        _methodParameterTypes652 = new String[] { "long" };

        _methodName653 = "hasContestEnded";

        _methodParameterTypes653 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName654 = "getWinnerProposal";

        _methodParameterTypes654 = new String[] { "long" };

        _methodName655 = "getPointsAccessibleForActivePhaseOfContest";

        _methodParameterTypes655 = new String[] { "com.ext.portlet.model.Contest" };
    }

    public Object invokeMethod(String name, String[] parameterTypes,
File
ContestLocalServiceClpInvoker.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
            return ContestLocalServiceUtil.getContestsMatchingOntologyTerms((java.util.List) arguments[0]);
        }

<<<<<<< HEAD
        if (_methodName638.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes638, parameterTypes)) {
=======
        if (_methodName626.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes626, parameterTypes)) {
            return ContestLocalServiceUtil.getContestsMatchingTier(((Long) arguments[0]).longValue());
        }

        if (_methodName627.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes627, parameterTypes)) {
            return ContestLocalServiceUtil.getContestsMatchingOntologyTermsAndTier((java.util.List) arguments[0],
                ((Long) arguments[1]).longValue());
        }

        if (_methodName628.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes628, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            ContestLocalServiceUtil.transferSupportsToVote((com.ext.portlet.model.Contest) arguments[0],
                (com.liferay.portal.service.ServiceContext) arguments[1]);
Solution content 
            return ContestLocalServiceUtil.getContestsMatchingOntologyTerms((java.util.List) arguments[0]);
        }

        if (_methodName638.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes638, parameterTypes)) {
            return ContestLocalServiceUtil.getContestsMatchingTier(((Long) arguments[0]).longValue());
        }

        if (_methodName639.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes639, parameterTypes)) {
            return ContestLocalServiceUtil.getContestsMatchingOntologyTermsAndTier((java.util.List) arguments[0],
                ((Long) arguments[1]).longValue());
        }

        if (_methodName640.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes640, parameterTypes)) {
            ContestLocalServiceUtil.transferSupportsToVote((com.ext.portlet.model.Contest) arguments[0],
                (com.liferay.portal.service.ServiceContext) arguments[1]);
File
ContestLocalServiceClpInvoker.java
Developer's decision
Manual
Kind of conflict
If statement
Chunk
Conflicting content 
            return null;
        }

<<<<<<< HEAD
        if (_methodName639.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes639, parameterTypes)) {
=======
        if (_methodName629.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes629, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            return ContestLocalServiceUtil.getProposalJudgeReviewCsv((com.ext.portlet.model.Contest) arguments[0],
                (com.ext.portlet.model.ContestPhase) arguments[1],
                (com.liferay.portal.service.ServiceContext) arguments[2]);
Solution content 
            return null;
        }

        if (_methodName641.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes641, parameterTypes)) {
            return ContestLocalServiceUtil.getProposalJudgeReviewCsv((com.ext.portlet.model.Contest) arguments[0],
                (com.ext.portlet.model.ContestPhase) arguments[1],
                (com.liferay.portal.service.ServiceContext) arguments[2]);
File
ContestLocalServiceClpInvoker.java
Developer's decision
Manual
Kind of conflict
If statement
Chunk
Conflicting content 
        }
                (com.liferay.portal.service.ServiceContext) arguments[2]);
        }

<<<<<<< HEAD
        if (_methodName641.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes641, parameterTypes)) {
            return ContestLocalServiceUtil.getAdvisorsForContest((com.ext.portlet.model.Contest) arguments[0]);
        }

        if (_methodName642.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes642, parameterTypes)) {
            return ContestLocalServiceUtil.getJudgesForContest((com.ext.portlet.model.Contest) arguments[0]);
        }

        if (_methodName643.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes643, parameterTypes)) {
            return ContestLocalServiceUtil.getFellowsForContest((com.ext.portlet.model.Contest) arguments[0]);
        }

        if (_methodName644.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes644, parameterTypes)) {
            return ContestLocalServiceUtil.getContestManagersForContest((com.ext.portlet.model.Contest) arguments[0]);

        if (_methodName647.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes647, parameterTypes)) {
            return ContestLocalServiceUtil.getContestLinkUrl((com.ext.portlet.model.Contest) arguments[0]);
        }

        if (_methodName650.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes650, parameterTypes)) {
            return ContestLocalServiceUtil.hasContestEnded(((Long) arguments[0]).longValue());
        }

        if (_methodName651.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes651, parameterTypes)) {
            return ContestLocalServiceUtil.hasContestEnded((com.ext.portlet.model.Contest) arguments[0]);
        }

        if (_methodName652.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes652, parameterTypes)) {
            return ContestLocalServiceUtil.getWinnerProposal(((Long) arguments[0]).longValue());
        }

        if (_methodName653.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes653, parameterTypes)) {
=======
        if (_methodName631.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes631, parameterTypes)) {
            return ContestLocalServiceUtil.getJudgesForContest((com.ext.portlet.model.Contest) arguments[0]);
        }

        if (_methodName632.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes632, parameterTypes)) {
            return ContestLocalServiceUtil.getFellowsForContest((com.ext.portlet.model.Contest) arguments[0]);
        }

        if (_methodName635.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes635, parameterTypes)) {
            return ContestLocalServiceUtil.getContestLinkUrl((com.ext.portlet.model.Contest) arguments[0]);
        }

        if (_methodName638.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes638, parameterTypes)) {
            return ContestLocalServiceUtil.hasContestEnded(((Long) arguments[0]).longValue());
        }

        if (_methodName639.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes639, parameterTypes)) {
            return ContestLocalServiceUtil.hasContestEnded((com.ext.portlet.model.Contest) arguments[0]);
        }

        if (_methodName640.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes640, parameterTypes)) {
            return ContestLocalServiceUtil.getWinnerProposal(((Long) arguments[0]).longValue());
        }

        if (_methodName641.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes641, parameterTypes)) {
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
            return ContestLocalServiceUtil.getPointsAccessibleForActivePhaseOfContest((com.ext.portlet.model.Contest) arguments[0]);
        }
Solution content 
                (com.liferay.portal.service.ServiceContext) arguments[2]);
        }

        if (_methodName643.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes643, parameterTypes)) {
            return ContestLocalServiceUtil.getAdvisorsForContest((com.ext.portlet.model.Contest) arguments[0]);
        }

        if (_methodName644.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes644, parameterTypes)) {
            return ContestLocalServiceUtil.getJudgesForContest((com.ext.portlet.model.Contest) arguments[0]);
        }

        if (_methodName645.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes645, parameterTypes)) {
            return ContestLocalServiceUtil.getFellowsForContest((com.ext.portlet.model.Contest) arguments[0]);
        }

        if (_methodName646.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes646, parameterTypes)) {
            return ContestLocalServiceUtil.getContestManagersForContest((com.ext.portlet.model.Contest) arguments[0]);
        }

        if (_methodName649.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes649, parameterTypes)) {
            return ContestLocalServiceUtil.getContestLinkUrl((com.ext.portlet.model.Contest) arguments[0]);
        }

        if (_methodName652.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes652, parameterTypes)) {
            return ContestLocalServiceUtil.hasContestEnded(((Long) arguments[0]).longValue());
        }

        if (_methodName653.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes653, parameterTypes)) {
            return ContestLocalServiceUtil.hasContestEnded((com.ext.portlet.model.Contest) arguments[0]);
        }

        if (_methodName654.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes654, parameterTypes)) {
            return ContestLocalServiceUtil.getWinnerProposal(((Long) arguments[0]).longValue());
        }

        if (_methodName655.equals(name) &&
                Arrays.deepEquals(_methodParameterTypes655, parameterTypes)) {
            return ContestLocalServiceUtil.getPointsAccessibleForActivePhaseOfContest((com.ext.portlet.model.Contest) arguments[0]);
        }
File
ContestLocalServiceClpInvoker.java
Developer's decision
Manual
Kind of conflict
If statement
Chunk
Conflicting content 
import java.util.TreeMap;

import com.ext.portlet.contests.ContestStatus;
<<<<<<< HEAD
=======
import com.google.common.collect.ImmutableSet;
import org.apache.commons.lang3.StringUtils;
import org.xcolab.enums.ContestPhasePromoteType;
import org.xcolab.enums.ContestPhaseType;
import org.xcolab.enums.ContestTier;
import org.xcolab.enums.MemberRole;
import org.xcolab.utils.emailnotification.ContestVoteNotification;
import org.xcolab.utils.emailnotification.ContestVoteQuestionNotification;
import org.xcolab.utils.judging.ProposalRatingWrapper;
import org.xcolab.utils.judging.ProposalReview;
import org.xcolab.utils.judging.ProposalReviewCsvExporter;

import com.ext.portlet.JudgingSystemActions;
import com.ext.portlet.NoSuchContestException;
import com.ext.portlet.NoSuchProposalContestPhaseAttributeException;
import com.ext.portlet.ProposalContestPhaseAttributeKeys;
import com.ext.portlet.discussions.DiscussionActions;
>>>>>>> 867a8a5865a12b545181218df4d93c1d7cde7f77
import com.ext.portlet.model.Contest;
import com.ext.portlet.model.ContestDebate;
import com.ext.portlet.model.ContestPhase;
Solution content 
import java.util.TreeMap;

import com.ext.portlet.contests.ContestStatus;
import com.google.common.collect.ImmutableSet;
import org.apache.commons.lang3.StringUtils;
import org.xcolab.enums.ContestPhasePromoteType;
import org.xcolab.enums.ContestPhaseType;
import org.xcolab.enums.ContestTier;
import org.xcolab.enums.MemberRole;
import org.xcolab.utils.emailnotification.ContestVoteQuestionNotification;
import org.xcolab.utils.judging.ProposalRatingWrapper;
import org.xcolab.utils.judging.ProposalReview;
import org.xcolab.utils.judging.ProposalReviewCsvExporter;

import com.ext.portlet.JudgingSystemActions;
import com.ext.portlet.NoSuchContestException;
import com.ext.portlet.NoSuchProposalContestPhaseAttributeException;
import com.ext.portlet.ProposalContestPhaseAttributeKeys;
import com.ext.portlet.discussions.DiscussionActions;

import com.ext.portlet.model.Contest;
import com.ext.portlet.model.ContestDebate;
import com.ext.portlet.model.ContestPhase;
File
ContestLocalServiceImpl.java
Developer's decision
Combination
Kind of conflict
Import