From: Kimmo R. <ki...@us...> - 2014-09-04 14:32:24
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19923/src/games/stendhal/client/gui Modified Files: Character.java ItemPanel.java SlotGrid.java SlotWindow.java Log Message: Added generic types Index: SlotWindow.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/SlotWindow.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** SlotWindow.java 23 Apr 2013 20:50:32 -0000 1.14 --- SlotWindow.java 4 Sep 2014 14:32:15 -0000 1.15 *************** *** 59,63 **** * @param types */ ! public void setAcceptedTypes(Class ... types) { content.setAcceptedTypes(types); } --- 59,63 ---- * @param types */ ! public void setAcceptedTypes(Class<? extends IEntity> ... types) { content.setAcceptedTypes(types); } Index: Character.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/Character.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Character.java 20 Jan 2014 22:49:00 -0000 1.10 --- Character.java 4 Sep 2014 14:32:14 -0000 1.11 *************** *** 109,113 **** content.add(row); ! Class itemClass = EntityMap.getClass("item", null, null); SpriteStore store = SpriteStore.get(); --- 109,113 ---- content.add(row); ! Class<? extends IEntity> itemClass = EntityMap.getClass("item", null, null); SpriteStore store = SpriteStore.get(); *************** *** 173,177 **** * @return item panel */ ! private ItemPanel createItemPanel(Class itemClass, SpriteStore store, String id, String image) { ItemPanel panel = new ItemPanel(id, store.getSprite(image)); slotPanels.put(id, panel); --- 173,177 ---- * @return item panel */ ! private ItemPanel createItemPanel(Class<? extends IEntity> itemClass, SpriteStore store, String id, String image) { ItemPanel panel = new ItemPanel(id, store.getSprite(image)); slotPanels.put(id, panel); Index: ItemPanel.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/ItemPanel.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** ItemPanel.java 29 Jun 2014 18:14:56 -0000 1.30 --- ItemPanel.java 4 Sep 2014 14:32:15 -0000 1.31 *************** *** 92,96 **** /** Object types the panel can accept. */ ! private List<Class> acceptedTypes = new ArrayList<Class>(); /** --- 92,96 ---- /** Object types the panel can accept. */ ! private List<Class<? extends IEntity>> acceptedTypes = new ArrayList<Class<? extends IEntity>>(); /** *************** *** 483,487 **** * @param types */ ! void setAcceptedTypes(Class ... types) { acceptedTypes = Arrays.asList(types); } --- 483,487 ---- * @param types */ ! void setAcceptedTypes(Class<? extends IEntity> ... types) { acceptedTypes = Arrays.asList(types); } *************** *** 492,496 **** * @param types */ ! void setAcceptedTypes(List<Class> types) { acceptedTypes = types; } --- 492,496 ---- * @param types */ ! void setAcceptedTypes(List<Class<? extends IEntity>> types) { acceptedTypes = types; } Index: SlotGrid.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/SlotGrid.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** SlotGrid.java 27 Jan 2013 17:37:57 -0000 1.14 --- SlotGrid.java 4 Sep 2014 14:32:15 -0000 1.15 *************** *** 70,76 **** * @param types */ ! public void setAcceptedTypes(Class ... types) { // Reuse the same set for all the panels ! List<Class> list = Arrays.asList(types); for (ItemPanel panel : panels) { panel.setAcceptedTypes(list); --- 70,76 ---- * @param types */ ! public void setAcceptedTypes(Class<? extends IEntity> ... types) { // Reuse the same set for all the panels ! List<Class<? extends IEntity>> list = Arrays.asList(types); for (ItemPanel panel : panels) { panel.setAcceptedTypes(list); |