Projects >> casmi >>9ca910643aa761076304b6f01d4e47f10674b6df

Chunk
Conflicting content 
        show(target, x, y);
    }

<<<<<<< HEAD
=======
    @SuppressWarnings("deprecation")
>>>>>>> ad3dcbe4b0bbfaebe2a9046fb0cabb7df5d02a67
    @Override
    public void show() {
        show(target, target.getMouseX(), target.getHeight() - target.getMouseY());
Solution content 
        show(target, x, y);
    }

    @SuppressWarnings("deprecation")
    @Override
    public void show() {
        show(target, target.getMouseX(), target.getHeight() - target.getMouseY());
File
PopupMenu.java
Developer's decision
Version 2
Kind of conflict
Annotation
Chunk
Conflicting content 
     *              The width of the Element's stroke.
     */
    public double getStrokeWidth() {
<<<<<<< HEAD
        return (double) strokeWidth;
=======
        return strokeWidth;
>>>>>>> ad3dcbe4b0bbfaebe2a9046fb0cabb7df5d02a67
    }

    /**
Solution content 
     *              The width of the Element's stroke.
     */
    public double getStrokeWidth() {
        return strokeWidth;
    }

    /**
File
Element.java
Developer's decision
Version 2
Kind of conflict
Attribute
Cast expression
Return statement
Chunk
Conflicting content 
        this.fillColor.setAlpha(alpha);
    }

<<<<<<< HEAD
=======
    @Override
>>>>>>> ad3dcbe4b0bbfaebe2a9046fb0cabb7df5d02a67
    public void setAlpha(double alpha) {
        this.sceneA = alpha;
    }
Solution content 
        this.fillColor.setAlpha(alpha);
    }

    @Override
    public void setAlpha(double alpha) {
        this.sceneA = alpha;
    }
File
Element.java
Developer's decision
Version 2
Kind of conflict
Annotation
Chunk
Conflicting content 
     * @deprecated This method is deprecated. Use {@link #setVisible(boolean)}
     *     instead.
     */
<<<<<<< HEAD
=======
    @Deprecated
>>>>>>> ad3dcbe4b0bbfaebe2a9046fb0cabb7df5d02a67
    public void visible() {
        visible = true;
    }
Solution content 
     * @deprecated This method is deprecated. Use {@link #setVisible(boolean)}
     *     instead.
     */
    @Deprecated
    public void visible() {
        visible = true;
    }
File
Element.java
Developer's decision
Version 2
Kind of conflict
Annotation
Chunk
Conflicting content 
     * @deprecated This method is deprecated. Use {@link #setVisible(boolean)}
     *     instead.
     */
<<<<<<< HEAD
=======
    @Deprecated
>>>>>>> ad3dcbe4b0bbfaebe2a9046fb0cabb7df5d02a67
    public void hidden() {
        visible = false;
    }
Solution content 
     * @deprecated This method is deprecated. Use {@link #setVisible(boolean)}
     *     instead.
     */
    @Deprecated
    public void hidden() {
        visible = false;
    }
File
Element.java
Developer's decision
Version 2
Kind of conflict
Annotation