Forum libero

giambo@phobos:~/code/FdtDueZero/FdTViewer$ git status
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 1 different commit(s) each, respectively.
#
# Changes not staged for commit:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	deleted:    ../FdTSucker/src/META-INF/MANIFEST.MF
#
no changes added to commit (use "git add" and/or "git commit -a")
giambo@phobos:~/code/FdtDueZero/FdTViewer$ git push
To giambo@ravanator.acmetoy.com:/src/FdtDueZero.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'giambo@ravanator.acmetoy.com:/src/FdtDueZero.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.
giambo@phobos:~/code/FdtDueZero/FdTViewer$ git pull
You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.
giambo@phobos:~/code/FdtDueZero/FdTViewer$ 

package com.acmetoy.ravanator.fdt.persistence;

import java.util.ArrayList;
import java.util.List;

public class ThreadsDTO {

	private List<ThreadDTO> messages;
	
	// numero totale di messaggi in tutte le pagine
	private int maxNrOfMessages;
	
	public ThreadsDTO() {
		this.messages = new ArrayList<ThreadDTO>();
		this.maxNrOfMessages = 0;
	}
	
	public ThreadsDTO(List<ThreadDTO> messages, int nrOfMessages) {
		this.messages = messages;
		this.maxNrOfMessages = nrOfMessages;
	}
	
	public List<ThreadDTO> getMessages() {
		return messages;
	}
	
	public int getMaxNrOfMessages() {
		return maxNrOfMessages;
	}

}