Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8784/src/net/sourceforge/bprocessor/model
Modified Files:
Selection.java
Log Message:
Renamed some private attributes in Selection
Index: Selection.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Selection.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Selection.java 6 Jan 2006 14:13:45 -0000 1.4
--- Selection.java 13 Jan 2006 09:38:55 -0000 1.5
***************
*** 13,16 ****
--- 13,17 ----
import java.util.LinkedList;
import java.util.List;
+ import java.util.Set;
/**
***************
*** 21,25 ****
public class Selection implements Collection {
/** The collection of objects */
! private Collection selection;
/** The observers */
--- 22,27 ----
public class Selection implements Collection {
/** The collection of objects */
! private Set mark;
!
/** The observers */
***************
*** 42,46 ****
public Selection() {
super();
! selection = new HashSet();
observers = new LinkedList();
}
--- 44,48 ----
public Selection() {
super();
! mark = new HashSet();
observers = new LinkedList();
}
***************
*** 52,56 ****
*/
public boolean contains(Object object) {
! return selection.contains(object);
}
--- 54,58 ----
*/
public boolean contains(Object object) {
! return mark.contains(object);
}
***************
*** 61,65 ****
*/
public boolean add(Object object) {
! if (selection.add(object)) {
changed();
return true;
--- 63,67 ----
*/
public boolean add(Object object) {
! if (mark.add(object)) {
changed();
return true;
***************
*** 75,79 ****
*/
public boolean remove(Object object) {
! if (selection.remove(object)) {
changed();
return true;
--- 77,81 ----
*/
public boolean remove(Object object) {
! if (mark.remove(object)) {
changed();
return true;
***************
*** 87,91 ****
*/
public void clear() {
! selection.clear();
changed();
}
--- 89,93 ----
*/
public void clear() {
! mark.clear();
changed();
}
***************
*** 106,110 ****
*/
public Iterator iterator() {
! return selection.iterator();
}
--- 108,112 ----
*/
public Iterator iterator() {
! return mark.iterator();
}
***************
*** 141,145 ****
*/
public int size() {
! return selection.size();
}
--- 143,147 ----
*/
public int size() {
! return mark.size();
}
***************
*** 149,153 ****
*/
public boolean isEmpty() {
! return selection.isEmpty();
}
--- 151,155 ----
*/
public boolean isEmpty() {
! return mark.isEmpty();
}
***************
*** 157,161 ****
*/
public Object[] toArray() {
! return selection.toArray();
}
--- 159,163 ----
*/
public Object[] toArray() {
! return mark.toArray();
}
***************
*** 166,170 ****
*/
public Object[] toArray(Object[] array) {
! return selection.toArray(array);
}
--- 168,172 ----
*/
public Object[] toArray(Object[] array) {
! return mark.toArray(array);
}
***************
*** 175,179 ****
*/
public boolean containsAll(Collection objects) {
! return selection.containsAll(objects);
}
--- 177,181 ----
*/
public boolean containsAll(Collection objects) {
! return mark.containsAll(objects);
}
***************
*** 184,188 ****
*/
public boolean addAll(Collection objects) {
! if (selection.addAll(objects)) {
changed();
return true;
--- 186,190 ----
*/
public boolean addAll(Collection objects) {
! if (mark.addAll(objects)) {
changed();
return true;
***************
*** 198,202 ****
*/
public boolean removeAll(Collection objects) {
! if (selection.removeAll(objects)) {
changed();
return true;
--- 200,204 ----
*/
public boolean removeAll(Collection objects) {
! if (mark.removeAll(objects)) {
changed();
return true;
***************
*** 212,216 ****
*/
public boolean retainAll(Collection objects) {
! if (selection.retainAll(objects)) {
changed();
return true;
--- 214,218 ----
*/
public boolean retainAll(Collection objects) {
! if (mark.retainAll(objects)) {
changed();
return true;
|