| Chunk |
|---|
| Conflicting content |
|---|
setChildren(new ArrayList |
| Solution content |
|---|
setChildren(new ArrayList |
| File |
|---|
| DLNAResource.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Other |
| Chunk |
|---|
| Conflicting content |
|---|
return false;
}
<<<<<<< HEAD
/**
* Handle last played stuff
*
* This method should be overridden by all media types that should be
* added to the last played list.
* By default it just returns null which means the resource is ignored
* in the last played file.
*/
public String write() {
return null;
}
private ExternalListener masterParent;
public void setMasterParent(ExternalListener r) {
if (masterParent == null) {
// If master is already set ignore this
masterParent = r;
}
}
public ExternalListener getMasterParent() {
return masterParent;
=======
////////////////////////////////////////////////////
// Resume handling
////////////////////////////////////////////////////
private ResumeObj resume;
private int resHash;
private long startTime;
public int resumeHash() {
return resHash;
}
public boolean isResumeable() {
if (getFormat() != null) {
// Only resume videos
return getFormat().isVideo();
}
return true;
}
private void resumeStop() {
if (!configuration.isResumeEnabled() || !isResumeable()) {
return;
}
if (resume != null) {
resume.stop(startTime, (long) (getMedia().getDurationInSeconds() * 1000));
if (resume.isDone()) {
getParent().getChildren().remove(this);
}
notifyRefresh();
} else {
for (DLNAResource res : getParent().getChildren()) {
if (res.isResume() && res.getName().equals(getName())) {
res.resume.stop(startTime, (long) (getMedia().getDurationInSeconds() * 1000));
if (res.resume.isDone()) {
getParent().getChildren().remove(res);
}
return;
}
}
ResumeObj r = ResumeObj.store(this, startTime);
if (r != null) {
DLNAResource clone = this.clone();
clone.resume = r;
clone.resHash = resHash;
clone.setMedia(getMedia());
clone.setPlayer(getPlayer());
getParent().addChildInternal(clone);
}
}
}
public final boolean isResume() {
return isResumeable() && (resume != null);
}
public int minPlayTime() {
return configuration.getMinPlayTime();
}
private String resumeStr(String s) {
if (isResume()) {
return Messages.getString("PMS.134") + ": " + s;
} else {
return s;
}
>>>>>>> 3e4642be23b752f058a0589a3386b55a07c46c18
}
} |
| Solution content |
|---|
return false;
}
////////////////////////////////////////////////////
// Resume handling
////////////////////////////////////////////////////
private ResumeObj resume;
private int resHash;
private long startTime;
public int resumeHash() {
return resHash;
}
public boolean isResumeable() {
if (getFormat() != null) {
// Only resume videos
return getFormat().isVideo();
}
return true;
}
private void resumeStop() {
if (!configuration.isResumeEnabled() || !isResumeable()) {
return;
}
if (resume != null) {
resume.stop(startTime, (long) (getMedia().getDurationInSeconds() * 1000));
if (resume.isDone()) {
getParent().getChildren().remove(this);
}
notifyRefresh();
} else {
for (DLNAResource res : getParent().getChildren()) {
if (res.isResume() && res.getName().equals(getName())) {
res.resume.stop(startTime, (long) (getMedia().getDurationInSeconds() * 1000));
if (res.resume.isDone()) {
getParent().getChildren().remove(res);
}
return;
}
}
ResumeObj r = ResumeObj.store(this, startTime);
if (r != null) {
DLNAResource clone = this.clone();
clone.resume = r;
clone.resHash = resHash;
clone.setMedia(getMedia());
clone.setPlayer(getPlayer());
getParent().addChildInternal(clone);
}
}
}
public final boolean isResume() {
return isResumeable() && (resume != null);
}
public int minPlayTime() {
return configuration.getMinPlayTime();
}
private String resumeStr(String s) {
if (isResume()) {
return Messages.getString("PMS.134") + ": " + s;
} else {
return s;
}
}
/**
* Handle last played stuff
*
* This method should be overridden by all media types that should be
* added to the last played list.
* By default it just returns null which means the resource is ignored
* in the last played file.
*/
public String write() {
return null;
}
private ExternalListener masterParent;
public void setMasterParent(ExternalListener r) {
if (masterParent == null) {
// If master is already set ignore this
masterParent = r;
}
}
public ExternalListener getMasterParent() {
return masterParent;
}
} |
| File |
|---|
| DLNAResource.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| If statement |
| Method declaration |
| Method signature |
| Return statement |
| Chunk |
|---|
| Conflicting content |
|---|
private static final Logger LOGGER = LoggerFactory.getLogger(NavigationShareTab.class);
public static final String ALL_DRIVES = Messages.getString("FoldTab.0");
<<<<<<< HEAD
private static final String PANEL_COL_SPEC = "left:pref, 50dlu, pref, 150dlu, pref, 25dlu, pref, 9dlu, pref, default:grow";
private static final String PANEL_ROW_SPEC = "p, 3dlu, p, 3dlu, p, 3dlu, p, 9dlu, p, 3dlu, p, 3dlu, p, 9dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 9dlu, fill:default:grow";
private static final String SHARED_FOLDER_COL_SPEC = "left:pref, left:pref, pref, pref, pref, pref, 0:grow";
=======
private static final String PANEL_COL_SPEC = "left:pref, 9dlu, pref, 3dlu, 25dlu, 9dlu, default:grow";
private static final String PANEL_ROW_SPEC = "p, 3dlu, p, 3dlu, p, 3dlu, p, 9dlu, p, 3dlu, p, 3dlu, p, 9dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 9dlu, fill:default:grow";
private static final String SHARED_FOLDER_COL_SPEC = "left:pref, left:pref, pref, pref, pref, 0:grow";
>>>>>>> 3e4642be23b752f058a0589a3386b55a07c46c18
private static final String SHARED_FOLDER_ROW_SPEC = "p, 3dlu, p, 3dlu, fill:default:grow";
private JList |
| Solution content |
|---|
private static final Logger LOGGER = LoggerFactory.getLogger(NavigationShareTab.class);
public static final String ALL_DRIVES = Messages.getString("FoldTab.0");
private static final String PANEL_COL_SPEC = "left:pref, 50dlu, pref, 150dlu, pref, 25dlu, pref, 9dlu, pref, default:grow";
private static final String PANEL_ROW_SPEC = "p, 3dlu, p, 3dlu, p, 3dlu, p, 9dlu, p, 3dlu, p, 3dlu, p, 9dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 9dlu, fill:default:grow";
private static final String SHARED_FOLDER_COL_SPEC = "left:pref, left:pref, pref, pref, pref, pref, 0:grow";
private static final String SHARED_FOLDER_ROW_SPEC = "p, 3dlu, p, 3dlu, fill:default:grow";
private JList |
| File |
|---|
| NavigationShareTab.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
private JTextField atzLimit; private JCheckBox liveSubtitles; private JCheckBox prettifyfilenames; <<<<<<< HEAD private JCheckBox newmediafolder; private JCheckBox recentlyplayedfolder; ======= private JCheckBox resume; >>>>>>> 3e4642be23b752f058a0589a3386b55a07c46c18 public DefaultListModel |
| Solution content |
|---|
private JTextField atzLimit; private JCheckBox liveSubtitles; private JCheckBox prettifyfilenames; private JCheckBox newmediafolder; private JCheckBox recentlyplayedfolder; private JCheckBox resume; public DefaultListModel |
| File |
|---|
| NavigationShareTab.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
=======
builder.add(atzLimit, FormLayoutUtil.flip(cc.xy(5, 23), colSpec, orientation));
builder.add(archive, FormLayoutUtil.flip(cc.xy(7, 23), colSpec, orientation));
<<<<<<< HEAD
builder.add(liveSubtitles, FormLayoutUtil.flip(cc.xyw(1, 25, 3), colSpec, orientation));
builder.addLabel(Messages.getString("FoldTab.37"), FormLayoutUtil.flip(cc.xyw(4, 25, 2), colSpec, orientation));
builder.add(atzLimit, FormLayoutUtil.flip(cc.xy(6, 25), colSpec, orientation));
builder.add(newmediafolder, FormLayoutUtil.flip(cc.xyw(9, 25, 2), colSpec, orientation));
builder.add(resume, FormLayoutUtil.flip(cc.xy(1, 25), colSpec, orientation));
>>>>>>> 3e4642be23b752f058a0589a3386b55a07c46c18
builder.add(builderSharedFolder.getPanel(), FormLayoutUtil.flip(cc.xyw(1, 27, 7), colSpec, orientation));
} else { |
| Solution content |
|---|
builder.add(liveSubtitles, FormLayoutUtil.flip(cc.xyw(1, 25, 3), colSpec, orientation));
builder.addLabel(Messages.getString("FoldTab.37"), FormLayoutUtil.flip(cc.xyw(4, 25, 2), colSpec, orientation));
builder.add(atzLimit, FormLayoutUtil.flip(cc.xy(6, 25), colSpec, orientation));
builder.add(newmediafolder, FormLayoutUtil.flip(cc.xyw(9, 25, 2), colSpec, orientation));
builder.add(builderSharedFolder.getPanel(), FormLayoutUtil.flip(cc.xyw(1, 27, 10), colSpec, orientation));
} else { |
| File |
|---|
| NavigationShareTab.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
}
});
<<<<<<< HEAD
newmediafolder = new JCheckBox(Messages.getString("FoldTab.53"));
newmediafolder.setContentAreaFilled(false);
if (configuration.isHideNewMediaFolder()) {
newmediafolder.setSelected(true);
}
newmediafolder.addItemListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
configuration.setHideNewMediaFolder((e.getStateChange() == ItemEvent.SELECTED));
hideextensions.setEnabled((e.getStateChange() != ItemEvent.SELECTED));
}
});
recentlyplayedfolder = new JCheckBox(Messages.getString("FoldTab.55"));
recentlyplayedfolder.setContentAreaFilled(false);
if (configuration.isHideRecentlyPlayedFolder()) {
recentlyplayedfolder.setSelected(true);
}
recentlyplayedfolder.addItemListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
configuration.setHideRecentlyPlayedFolder((e.getStateChange() == ItemEvent.SELECTED));
hideextensions.setEnabled((e.getStateChange() != ItemEvent.SELECTED));
=======
resume = new JCheckBox(Messages.getString("NetworkTab.68"));
resume.setToolTipText(Messages.getString("NetworkTab.69"));
resume.setContentAreaFilled(false);
if (configuration.isResumeEnabled()) {
resume.setSelected(true);
}
resume.addItemListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
configuration.setResume((e.getStateChange() == ItemEvent.SELECTED));
>>>>>>> 3e4642be23b752f058a0589a3386b55a07c46c18
}
});
} |
| Solution content |
|---|
}
});
newmediafolder = new JCheckBox(Messages.getString("FoldTab.53"));
newmediafolder.setContentAreaFilled(false);
if (configuration.isHideNewMediaFolder()) {
newmediafolder.setSelected(true);
}
newmediafolder.addItemListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
configuration.setHideNewMediaFolder((e.getStateChange() == ItemEvent.SELECTED));
hideextensions.setEnabled((e.getStateChange() != ItemEvent.SELECTED));
}
});
recentlyplayedfolder = new JCheckBox(Messages.getString("FoldTab.55"));
recentlyplayedfolder.setContentAreaFilled(false);
if (configuration.isHideRecentlyPlayedFolder()) {
recentlyplayedfolder.setSelected(true);
}
recentlyplayedfolder.addItemListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
configuration.setHideRecentlyPlayedFolder((e.getStateChange() == ItemEvent.SELECTED));
hideextensions.setEnabled((e.getStateChange() != ItemEvent.SELECTED));
}
});
resume = new JCheckBox(Messages.getString("NetworkTab.68"));
resume.setToolTipText(Messages.getString("NetworkTab.69"));
resume.setContentAreaFilled(false);
if (configuration.isResumeEnabled()) {
resume.setSelected(true);
}
resume.addItemListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
configuration.setResume((e.getStateChange() == ItemEvent.SELECTED));
}
});
} |
| File |
|---|
| NavigationShareTab.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| If statement |
| Method invocation |