From eb58734fea575dc0431dafcded875ac7eb42b5eb Mon Sep 17 00:00:00 2001 From: George Kankava Date: Sat, 2 Jul 2016 10:16:50 +0400 Subject: [PATCH] squid:S1161 - '@Override' annotation should be used on any method overriding (since Java 5) or implementing (since Java 6) another one --- .../java/com/moez/QKSMS/model/SlideModel.java | 23 +++++++++++++++++++ .../com/moez/QKSMS/model/SlideshowModel.java | 22 ++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/model/SlideModel.java b/QKSMS/src/main/java/com/moez/QKSMS/model/SlideModel.java index 7b580132..bcea5e28 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/model/SlideModel.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/model/SlideModel.java @@ -279,16 +279,19 @@ public class SlideModel extends Model implements List, EventListener * @throws ContentRestrictionException when can not add this object. * */ + @Override public boolean add(MediaModel object) { internalAdd(object); notifyModelChanged(true); return true; } + @Override public boolean addAll(Collection collection) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public void clear() { if (mMedia.size() > 0) { for (MediaModel media : mMedia) { @@ -312,22 +315,27 @@ public class SlideModel extends Model implements List, EventListener } } + @Override public boolean contains(Object object) { return mMedia.contains(object); } + @Override public boolean containsAll(Collection collection) { return mMedia.containsAll(collection); } + @Override public boolean isEmpty() { return mMedia.isEmpty(); } + @Override public Iterator iterator() { return mMedia.iterator(); } + @Override public boolean remove(Object object) { if ((object != null) && (object instanceof MediaModel) && internalRemove(object)) { @@ -337,35 +345,43 @@ public class SlideModel extends Model implements List, EventListener return false; } + @Override public boolean removeAll(Collection collection) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public boolean retainAll(Collection collection) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public int size() { return mMedia.size(); } + @Override public Object[] toArray() { return mMedia.toArray(); } + @Override public T[] toArray(T[] array) { return mMedia.toArray(array); } + @Override public void add(int location, MediaModel object) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public boolean addAll(int location, Collection collection) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public MediaModel get(int location) { if (mMedia.size() == 0) { return null; @@ -374,22 +390,27 @@ public class SlideModel extends Model implements List, EventListener return mMedia.get(location); } + @Override public int indexOf(Object object) { return mMedia.indexOf(object); } + @Override public int lastIndexOf(Object object) { return mMedia.lastIndexOf(object); } + @Override public ListIterator listIterator() { return mMedia.listIterator(); } + @Override public ListIterator listIterator(int location) { return mMedia.listIterator(location); } + @Override public MediaModel remove(int location) { MediaModel media = mMedia.get(location); if ((media != null) && internalRemove(media)) { @@ -398,10 +419,12 @@ public class SlideModel extends Model implements List, EventListener return media; } + @Override public MediaModel set(int location, MediaModel object) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public List subList(int start, int end) { return mMedia.subList(start, end); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/model/SlideshowModel.java b/QKSMS/src/main/java/com/moez/QKSMS/model/SlideshowModel.java index 88cb3512..1e6142b5 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/model/SlideshowModel.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/model/SlideshowModel.java @@ -406,6 +406,7 @@ public class SlideshowModel extends Model // // Implement List interface. // + @Override public boolean add(SlideModel object) { int increaseSize = object.getSlideSize(); checkMessageSize(increaseSize); @@ -422,10 +423,12 @@ public class SlideshowModel extends Model return false; } + @Override public boolean addAll(Collection collection) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public void clear() { if (mSlides.size() > 0) { for (SlideModel slide : mSlides) { @@ -440,22 +443,27 @@ public class SlideshowModel extends Model } } + @Override public boolean contains(Object object) { return mSlides.contains(object); } + @Override public boolean containsAll(Collection collection) { return mSlides.containsAll(collection); } + @Override public boolean isEmpty() { return mSlides.isEmpty(); } + @Override public Iterator iterator() { return mSlides.iterator(); } + @Override public boolean remove(Object object) { if ((object != null) && mSlides.remove(object)) { SlideModel slide = (SlideModel) object; @@ -467,26 +475,32 @@ public class SlideshowModel extends Model return false; } + @Override public boolean removeAll(Collection collection) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public boolean retainAll(Collection collection) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public int size() { return mSlides.size(); } + @Override public Object[] toArray() { return mSlides.toArray(); } + @Override public T[] toArray(T[] array) { return mSlides.toArray(array); } + @Override public void add(int location, SlideModel object) { if (object != null) { int increaseSize = object.getSlideSize(); @@ -502,31 +516,38 @@ public class SlideshowModel extends Model } } + @Override public boolean addAll(int location, Collection collection) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public SlideModel get(int location) { return (location >= 0 && location < mSlides.size()) ? mSlides.get(location) : null; } + @Override public int indexOf(Object object) { return mSlides.indexOf(object); } + @Override public int lastIndexOf(Object object) { return mSlides.lastIndexOf(object); } + @Override public ListIterator listIterator() { return mSlides.listIterator(); } + @Override public ListIterator listIterator(int location) { return mSlides.listIterator(location); } + @Override public SlideModel remove(int location) { SlideModel slide = mSlides.remove(location); if (slide != null) { @@ -537,6 +558,7 @@ public class SlideshowModel extends Model return slide; } + @Override public SlideModel set(int location, SlideModel object) { SlideModel slide = mSlides.get(location); if (null != object) {