From: <th...@us...> - 2012-03-01 22:26:38
|
Revision: 16392 http://pcgen.svn.sourceforge.net/pcgen/?rev=16392&view=rev Author: thpr Date: 2012-03-01 22:26:31 +0000 (Thu, 01 Mar 2012) Log Message: ----------- Add @Override as appropriate Cleans up warnings by adding appropriate Generics items Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/DefaultDataViewColumn.java Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewModelWrapper.java Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewPath.java Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewTableModel.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/DefaultDataViewColumn.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/DefaultDataViewColumn.java 2012-03-01 22:24:49 UTC (rev 16391) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/DefaultDataViewColumn.java 2012-03-01 22:26:31 UTC (rev 16392) @@ -68,21 +68,25 @@ } } + @Override public String getName() { return name; } + @Override public Class<?> getDataClass() { return dataclass; } + @Override public Visibility getVisibility() { return visibility; } + @Override public boolean isEditable() { return editable; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewModelWrapper.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewModelWrapper.java 2012-03-01 22:24:49 UTC (rev 16391) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewModelWrapper.java 2012-03-01 22:26:31 UTC (rev 16392) @@ -47,21 +47,25 @@ this.dataModel = dataModel; } + @Override public ListFacade<? extends TreeView<E>> getTreeViews() { return treeviewModel.getTreeViews(); } + @Override public int getDefaultTreeViewIndex() { return treeviewModel.getDefaultTreeViewIndex(); } + @Override public DataView<E> getDataView() { return treeviewModel.getDataView(); } + @Override public DefaultListFacade<E> getDataModel() { return dataModel; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewPath.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewPath.java 2012-03-01 22:24:49 UTC (rev 16391) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewPath.java 2012-03-01 22:26:31 UTC (rev 16392) @@ -165,7 +165,7 @@ return false; } - final TreeViewPath other = (TreeViewPath) obj; + final TreeViewPath<?> other = (TreeViewPath<?>) obj; if (this.length != other.length) { return false; @@ -178,14 +178,14 @@ * the last path component. * @return the parent path */ - public TreeViewPath getParentPath() + public TreeViewPath<E> getParentPath() { - return new TreeViewPath(path, length - 1); + return new TreeViewPath<E>(path, length - 1); } - public TreeViewPath getParentPath(int lastElement) + public TreeViewPath<E> getParentPath(int lastElement) { - return new TreeViewPath(path, lastElement + 1); + return new TreeViewPath<E>(path, lastElement + 1); } public TreeViewPath<E> pathByAddingParent(String singlePath) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewTableModel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewTableModel.java 2012-03-01 22:24:49 UTC (rev 16391) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewTableModel.java 2012-03-01 22:26:31 UTC (rev 16392) @@ -56,16 +56,19 @@ private final ListListener<E> listListener = new ListListener<E>() { + @Override public void elementAdded(ListEvent<E> e) { addElement(e.getElement()); } + @Override public void elementRemoved(ListEvent<E> e) { removeElement(e.getElement()); } + @Override public void elementsChanged(ListEvent<E> e) { //Todo: optimize @@ -76,21 +79,25 @@ private final DataViewColumn namecolumn = new DataViewColumn() { + @Override public String getName() { return selectedView.getViewName(); } + @Override public Class<?> getDataClass() { return TreeTableNode.class; } + @Override public Visibility getVisibility() { return Visibility.ALWAYS_VISIBLE; } + @Override public boolean isEditable() { return true; @@ -216,6 +223,7 @@ } } + @Override public final int getColumnCount() { return datacolumns.size() + 1; @@ -254,6 +262,7 @@ } } + @Override public final void sortModel(Comparator<List<?>> comparator) { TreeViewNode root = (TreeViewNode) getRoot(); @@ -462,6 +471,7 @@ this.mostRecentComparator = comparator; } + @Override @SuppressWarnings("unchecked") public void sortChildren(Comparator<TreeTableNode> comparator) { @@ -485,6 +495,7 @@ } } + @Override public List<Object> getValues() { Vector<Object> list = new Vector<Object>(getColumnCount()); @@ -498,6 +509,7 @@ return list; } + @Override public Object getValueAt(int column) { if (column == 0) @@ -512,6 +524,7 @@ return null; } + @Override @SuppressWarnings("unchecked") public void setValueAt(Object value, int column) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |