Projects >> splunk-sdk-java >>797ef2d63b64bf6c4b6f56e27f4e224da855a115

Chunk
Conflicting content 
    public  void printEntities(EntityCollection entities) {
    	System.out.format("\n# %s\n", entities.getPath());
        printActions(entities.getActions());
<<<<<<< HEAD
        System.out.format("keys = %s\n", entities.keySet().toString());
        for (Entity entity : entities.values()) 
=======
        for (T entity : entities.values()) 
>>>>>>> 13e754f2c8af4153e337b2864daf59f6f985edbd
            printEntity(entity);
    }
Solution content 
    public  void printEntities(EntityCollection entities) {
    	System.out.format("\n# %s\n", entities.getPath());
        printActions(entities.getActions());
        System.out.format("keys = %s\n", entities.keySet().toString());
        for (T entity : entities.values()) 
            printEntity(entity);
    }
File
Program.java
Developer's decision
Combination
Kind of conflict
For statement
Method invocation
Chunk
Conflicting content 
            args[0] = service;
            this.entities = new HashMap();
            for (AtomEntry entry : value.entries) {
<<<<<<< HEAD
                args[1] = entry.id; // Entity path
                Entity entity = (Entity)ctor.newInstance(args);
=======
                args[1] = entry.id;
                T entity = (T)ctor.newInstance(args);
>>>>>>> 13e754f2c8af4153e337b2864daf59f6f985edbd
                entity.load(entry);
                this.entities.put(entity.getName(), entity);
            }
Solution content 
            args[0] = service;
            this.entities = new HashMap();
            for (AtomEntry entry : value.entries) {
                args[1] = entry.id; // Entity path
                T entity = (T)ctor.newInstance(args);
                entity.load(entry);
                this.entities.put(entity.getName(), entity);
            }
File
EntityCollection.java
Developer's decision
Combination
Kind of conflict
Array access
Cast expression
Comment
Variable