Projects >> apvs >>a5fb5defdc1ca26c38dffeb50986b132e39bbf6e

Chunk
Conflicting content 
import java.util.List;
import java.util.Map;

<<<<<<< HEAD
import com.google.gwt.user.client.Window;

import ch.cern.atlas.apvs.client.domain.Intervention;
import ch.cern.atlas.apvs.client.domain.InterventionMap;

public class AudioSettings implements Serializable {
=======
import com.google.gwt.user.client.rpc.IsSerializable;

//NOTE: implements IsSerializable in case serialization file cannot be found
public class AudioSettings implements Serializable, IsSerializable {
>>>>>>> aaf867325916b61f52a920a99417b173d64f9f70

	private static final long serialVersionUID = 1L;
	private Map entries = new HashMap();
Solution content 
import java.util.List;
import java.util.Map;
import com.google.gwt.user.client.Window;
import ch.cern.atlas.apvs.client.domain.Intervention;
import ch.cern.atlas.apvs.client.domain.InterventionMap;
import com.google.gwt.user.client.rpc.IsSerializable;

//NOTE: implements IsSerializable in case serialization file cannot be found
public class AudioSettings implements Serializable, IsSerializable {

	private static final long serialVersionUID = 1L;
	private Map entries = new HashMap();
File
AudioSettings.java
Developer's decision
Combination
Kind of conflict
Class signature
Comment
Import
Chunk
Conflicting content 
import java.io.Serializable;

<<<<<<< HEAD
import ch.cern.atlas.apvs.client.domain.Intervention;

public class VoipAccount implements Serializable {
=======
import com.google.gwt.user.client.rpc.IsSerializable;

//NOTE: implements IsSerializable in case serialization file cannot be found
public class VoipAccount implements Serializable, IsSerializable {
>>>>>>> aaf867325916b61f52a920a99417b173d64f9f70

	private static final long serialVersionUID = 1L;
	private String account;
Solution content 
import java.io.Serializable;
import ch.cern.atlas.apvs.client.domain.Intervention;

import com.google.gwt.user.client.rpc.IsSerializable;

//NOTE: implements IsSerializable in case serialization file cannot be found
public class VoipAccount implements Serializable, IsSerializable {

	private static final long serialVersionUID = 1L;
	private String account;
File
VoipAccount.java
Developer's decision
Combination
Kind of conflict
Class signature
Comment
Import
Chunk
Conflicting content 
					}
				});

<<<<<<< HEAD
			@Override
			public void onInterventionMapChanged(
					InterventionMapChangedRemoteEvent event) {
				InterventionMap interventions = event.getInterventionMap();
				boolean changed = false;
				for (Iterator i = interventions.getPtuIds().iterator(); i.hasNext(); ) {
					String ptuId = i.next();
					if(audioSettings.contains(ptuId)) {
						boolean set = audioSettings.setIntervention(ptuId, interventions.get(ptuId));
						System.out.println("Resultado de set: "+ set);
						//boolean set = audioSettings.setUsername(ptuId, interventions.get(ptuId).getName());
						changed |= set;
					} else {
						boolean added = audioSettings.add(ptuId);
						changed |= added;
=======
		InterventionMapChangedRemoteEvent.subscribe(eventBus,
				new InterventionMapChangedRemoteEvent.Handler() {

					@Override
					public void onInterventionMapChanged(
							InterventionMapChangedRemoteEvent event) {
						InterventionMap interventions = event
								.getInterventionMap();
						boolean changed = false;
						for (Iterator i = interventions.getPtuIds()
								.iterator(); i.hasNext();) {
							String ptuId = i.next();
							if (audioSettings.contains(ptuId)) {
								boolean set = audioSettings.setUsername(ptuId,
										interventions.get(ptuId).getName());
								changed |= set;
							} else {
								boolean added = audioSettings.add(ptuId);
								changed |= added;
							}
						}

						if (changed) {
							eventBus.fireEvent(new AudioUsersSettingsChangedRemoteEvent(
									audioSettings));
						}
>>>>>>> aaf867325916b61f52a920a99417b173d64f9f70
					}
				});
Solution content 
					}
				});

		InterventionMapChangedRemoteEvent.subscribe(eventBus,
				new InterventionMapChangedRemoteEvent.Handler() {

			@Override
			public void onInterventionMapChanged(InterventionMapChangedRemoteEvent event) {
				InterventionMap interventions = event.getInterventionMap();
				boolean changed = false;
				
				for (Iterator i = interventions.getPtuIds().iterator(); i.hasNext(); ) {
					String ptuId = i.next();
					if(audioSettings.contains(ptuId)) {
						boolean set = audioSettings.setIntervention(ptuId, interventions.get(ptuId));
						System.out.println("Resultado de set: "+ set);
						//boolean set = audioSettings.setUsername(ptuId, interventions.get(ptuId).getName());
						changed |= set;
					}else{
						boolean added = audioSettings.add(ptuId);
						changed |= added;
					}
				}
				
				if (changed) {
					eventBus.fireEvent(new AudioUsersSettingsChangedRemoteEvent(audioSettings));
				}
			}
		});
File
AudioUsersSettingsStorage.java
Developer's decision
Manual
Kind of conflict
Annotation
Comment
For statement
If statement
Method invocation
Method signature
Variable