Projects >> UniversalMediaServer >>78f0729515a35fa49243b106baf1e57ebe0c7d05

Chunk
Conflicting content 
					} else if (mime.equals(RemoteUtil.MIME_MP4)) {
							ffmp4Cmd(cmdList);
					} else if (mime.equals(RemoteUtil.MIME_WEBM)) {
<<<<<<< HEAD
						if (isChromeTrick()) {
							chromeCmd(cmdList);
						} else {
							// nothing here yet
						}
=======
							if (isChromeTrick()) {
								chromeCmd(cmdList);
							} else {
								// nothing here yet
							}
>>>>>>> 822e52a21e3f77a807180c33bf2449ee5d990e85
					}
				}
				if (isLowBitrate()) {
Solution content 
					} else if (mime.equals(RemoteUtil.MIME_MP4)) {
							ffmp4Cmd(cmdList);
					} else if (mime.equals(RemoteUtil.MIME_WEBM)) {
							if (isChromeTrick()) {
								chromeCmd(cmdList);
							} else {
								// nothing here yet
							}
					}
				}
				if (isLowBitrate()) {
File
WebRender.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
	public void read() {
		try {
<<<<<<< HEAD
			BufferedReader in = new BufferedReader(new FileReader(file));
				String str;
				while ((str = in.readLine()) != null) {
					String[] tmp = str.split(",");
					offsetTime = Long.parseLong(tmp[0]);
					if (tmp.length > 1) {
						resDuration = Long.parseLong(tmp[1]);
					}
					break;
				}
=======
		BufferedReader in = new BufferedReader(new FileReader(file));
			String str;
			while ((str = in.readLine()) != null) {
				String[] tmp = str.split(",");
				offsetTime = Long.parseLong(tmp[0]);
				if (tmp.length > 1) {
					resDuration = Long.parseLong(tmp[1]);
				}
				break;
			}
		in.close();
>>>>>>> 822e52a21e3f77a807180c33bf2449ee5d990e85
		} catch (IOException e) {
		}
	}
Solution content 
	public void read() {
		try {
		BufferedReader in = new BufferedReader(new FileReader(file));
			String str;
			while ((str = in.readLine()) != null) {
				String[] tmp = str.split(",");
				offsetTime = Long.parseLong(tmp[0]);
				if (tmp.length > 1) {
					resDuration = Long.parseLong(tmp[1]);
				}
				break;
			}
		in.close();
		} catch (IOException e) {
		}
	}
File
ResumeObj.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
While statement
Chunk
Conflicting content 
		try {
			FileInputStream fis = new FileInputStream(purge);
<<<<<<< HEAD
				BufferedReader in = new BufferedReader(new InputStreamReader(fis)); 
=======
			BufferedReader in = new BufferedReader(new InputStreamReader(fis)); 
>>>>>>> 822e52a21e3f77a807180c33bf2449ee5d990e85
				String line;

				while ((line = in.readLine()) != null) {
Solution content 
		try {
			FileInputStream fis = new FileInputStream(purge);
			BufferedReader in = new BufferedReader(new InputStreamReader(fis)); 
				String line;

				while ((line = in.readLine()) != null) {
File
ExternalFactory.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
						f.delete();
					}
				}
<<<<<<< HEAD
=======
			in.close();
>>>>>>> 822e52a21e3f77a807180c33bf2449ee5d990e85
			fis.close();
		} catch (IOException e) { }
		purge.delete();
Solution content 
						f.delete();
					}
				}
			in.close();
			fis.close();
		} catch (IOException e) { }
		purge.delete();
File
ExternalFactory.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
		Logical player = uuid != null ? getPlayer(uuid) : null;

		if (player != null) {
<<<<<<< HEAD
			if (p[2] == "status") {
					// limit status updates to one per second
					UPNPHelper.sleep(1000);
					log = false;
			} else if (p[2] == "play") {
					player.pressPlay(translate(q.get("uri")), q.get("title"));
			} else if (p[2] == "stop") {
					player.pressStop();
			} else if (p[2] == "prev") {
					player.prev();
			} else if (p[2] == "next") {
					player.next();
			} else if (p[2] == "fwd") {
					player.forward();
			} else if (p[2] == "rew") {
					player.rewind();
			} else if (p[2] == "mute") {
					player.mute();
			} else if (p[2] == "setvolume") {
					player.setVolume(Integer.valueOf(q.get("vol")));
			} else if (p[2] == "add") {
					player.add(-1, translate(q.get("uri")), q.get("title"), null, true);
			} else if (p[2] == "remove") {
					player.remove(translate(q.get("uri")));
			} else if (p[2] == "clear") {
					player.clear();
			} else if (p[2] == "seturi") {
=======
			if ("status".equals(p[2])) {
					// limit status updates to one per second
					UPNPHelper.sleep(1000);
					log = false;
			} else if ("play".equals(p[2])) {
					player.pressPlay(translate(q.get("uri")), q.get("title"));
			} else if ("stop".equals(p[2])) {
					player.pressStop();
			} else if ("prev".equals(p[2])) {
					player.prev();
			} else if ("next".equals(p[2])) {
					player.next();
			} else if ("fwd".equals(p[2])) {
					player.forward();
			} else if ("rew".equals(p[2])) {
					player.rewind();
			} else if ("mute".equals(p[2])) {
					player.mute();
			} else if ("setvolume".equals(p[2])) {
					player.setVolume(Integer.valueOf(q.get("vol")));
			} else if ("add".equals(p[2])) {
					player.add(-1, translate(q.get("uri")), q.get("title"), null, true);
			} else if ("remove".equals(p[2])) {
					player.remove(translate(q.get("uri")));
			} else if ("clear".equals(p[2])) {
					player.clear();
			} else if ("seturi".equals(p[2])) {
>>>>>>> 822e52a21e3f77a807180c33bf2449ee5d990e85
					player.setURI(translate(q.get("uri")), q.get("title"));
			}
			json.add(getPlayerState(player));
Solution content 
		Logical player = uuid != null ? getPlayer(uuid) : null;

		if (player != null) {
			if ("status".equals(p[2])) {
					// limit status updates to one per second
					UPNPHelper.sleep(1000);
					log = false;
			} else if ("play".equals(p[2])) {
					player.pressPlay(translate(q.get("uri")), q.get("title"));
			} else if ("stop".equals(p[2])) {
					player.pressStop();
			} else if ("prev".equals(p[2])) {
					player.prev();
			} else if ("next".equals(p[2])) {
					player.next();
			} else if ("fwd".equals(p[2])) {
					player.forward();
			} else if ("rew".equals(p[2])) {
					player.rewind();
			} else if ("mute".equals(p[2])) {
					player.mute();
			} else if ("setvolume".equals(p[2])) {
					player.setVolume(Integer.valueOf(q.get("vol")));
			} else if ("add".equals(p[2])) {
					player.add(-1, translate(q.get("uri")), q.get("title"), null, true);
			} else if ("remove".equals(p[2])) {
					player.remove(translate(q.get("uri")));
			} else if ("clear".equals(p[2])) {
					player.clear();
			} else if ("seturi".equals(p[2])) {
					player.setURI(translate(q.get("uri")), q.get("title"));
			}
			json.add(getPlayerState(player));
File
PlayerControlHandler.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Method invocation
Variable
Chunk
Conflicting content 
		public void mark(String uuid, int property, Object value) {
			for (T i : get(uuid).values()) {
<<<<<<< HEAD
=======
				/**
				 * Note: Use valueOf on Java 6 instead of casting.
				 */
>>>>>>> 822e52a21e3f77a807180c33bf2449ee5d990e85
				if (property == ACTIVE) {
						i.setActive(Boolean.valueOf((String) value));
				} else if (property == CONTROLS) {
Solution content 
		public void mark(String uuid, int property, Object value) {
			for (T i : get(uuid).values()) {
				/**
				 * Note: Use valueOf on Java 6 instead of casting.
				 */
				if (property == ACTIVE) {
						i.setActive(Boolean.valueOf((String) value));
				} else if (property == CONTROLS) {
File
UPNPControl.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
				try {
					FileInputStream fis = new FileInputStream(f);
<<<<<<< HEAD
						BufferedReader in = new BufferedReader(new InputStreamReader(fis));
=======
					BufferedReader in = new BufferedReader(new InputStreamReader(fis));
>>>>>>> 822e52a21e3f77a807180c33bf2449ee5d990e85
						String line;
						StringBuilder sb = new StringBuilder();
						while ((line = in.readLine()) != null) {
Solution content 
				try {
					FileInputStream fis = new FileInputStream(f);
					BufferedReader in = new BufferedReader(new InputStreamReader(fis));
						String line;
						StringBuilder sb = new StringBuilder();
						while ((line = in.readLine()) != null) {
File
PluginTab.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
							sb.append("\n");
						}
						textArea.setText(sb.toString());
<<<<<<< HEAD
=======
					in.close();
>>>>>>> 822e52a21e3f77a807180c33bf2449ee5d990e85
					fis.close();
				} catch (IOException e1) {
					return;
Solution content 
							sb.append("\n");
						}
						textArea.setText(sb.toString());
					in.close();
					fis.close();
				} catch (IOException e1) {
					return;
File
PluginTab.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
				tag.add(groupTag);
			}

<<<<<<< HEAD
=======
			/**
			 * Note: Use getHostName() on Java 6 instead of getHostString().
			 */
>>>>>>> 822e52a21e3f77a807180c33bf2449ee5d990e85
			tag.add(t.getRemoteAddress().getHostName());
			tag.add("web");
			root = new RootFolder(tag);
Solution content 
				tag.add(groupTag);
			}

			/**
			 * Note: Use getHostName() on Java 6 instead of getHostString().
			 */
			tag.add(t.getRemoteAddress().getHostName());
			tag.add("web");
			root = new RootFolder(tag);
File
RemoteWeb.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
	public void sync() {
		try {
			FileOutputStream out = new FileOutputStream(file);
<<<<<<< HEAD

=======
>>>>>>> 822e52a21e3f77a807180c33bf2449ee5d990e85
			// Write a dummy line to make sure the file exists
			Date now = new Date();
			String data = "#########################\n#### Db file generated " + now.toString() + "\n" +
Solution content 
	public void sync() {
		try {
			FileOutputStream out = new FileOutputStream(file);
			// Write a dummy line to make sure the file exists
			Date now = new Date();
			String data = "#########################\n#### Db file generated " + now.toString() + "\n" +
File
FileDb.java
Developer's decision
Version 1
Kind of conflict
Blank