Menu
▾
▴
[Arianne-commits] stendhal/src/games/stendhal/client/actions GMHelpScriptAction.java, 1.2, 1.3 SummonAtAction.java, 1.8, 1.9 SoundAction.java, 1.7, 1.8 GMHelpAction.java, 1.17, 1.18 HelpAction.java, 1.16, 1.17 DropAction.java, 1.22, 1.23 GMHelpAlterAction.java, 1.7, 1.8 SummonAction.java, 1.11, 1.12
|
From: Astrid S. <ast...@us...> - 2008-10-14 07:12:33
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/actions In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27533/src/games/stendhal/client/actions Modified Files: GMHelpScriptAction.java SummonAtAction.java SoundAction.java GMHelpAction.java HelpAction.java DropAction.java GMHelpAlterAction.java SummonAction.java Log Message: introduced Eventline class which represents an entry into Chatlog, narrowed StendhalUI interface accordingly Index: HelpAction.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/actions/HelpAction.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** HelpAction.java 12 Jul 2008 14:43:42 -0000 1.16 --- HelpAction.java 14 Oct 2008 07:12:21 -0000 1.17 *************** *** 2,5 **** --- 2,6 ---- import games.stendhal.client.StendhalUI; + import games.stendhal.client.gui.chatlog.HeaderLessEventLine; import games.stendhal.common.NotificationType; *************** *** 47,51 **** for (final String line : lines) { ! StendhalUI.get().addEventLine(line, NotificationType.CLIENT); } --- 48,52 ---- for (final String line : lines) { ! StendhalUI.get().addEventLine(new HeaderLessEventLine(line, NotificationType.CLIENT)); } Index: SoundAction.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/actions/SoundAction.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SoundAction.java 12 Jul 2008 14:43:42 -0000 1.7 --- SoundAction.java 14 Oct 2008 07:12:21 -0000 1.8 *************** *** 2,5 **** --- 2,6 ---- import games.stendhal.client.StendhalUI; + import games.stendhal.client.gui.chatlog.StandardEventLine; import games.stendhal.client.gui.wt.core.WtWindowManager; import games.stendhal.client.sound.SoundSystem; *************** *** 40,45 **** if ((vol < 0) || (vol > 100)) { ! StendhalUI.get().addEventLine( ! "Volume must be an integer between 0 and 100"); } else { WtWindowManager.getInstance().setProperty("sound.volume", --- 41,46 ---- if ((vol < 0) || (vol > 100)) { ! StendhalUI.get().addEventLine(new StandardEventLine( ! "Volume must be an integer between 0 and 100")); } else { WtWindowManager.getInstance().setProperty("sound.volume", Index: SummonAction.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/actions/SummonAction.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** SummonAction.java 12 Jul 2008 14:43:42 -0000 1.11 --- SummonAction.java 14 Oct 2008 07:12:21 -0000 1.12 *************** *** 4,7 **** --- 4,8 ---- import games.stendhal.client.StendhalUI; import games.stendhal.client.entity.User; + import games.stendhal.client.gui.chatlog.StandardEventLine; import games.stendhal.common.NameBuilder; import marauroa.common.game.RPAction; *************** *** 50,54 **** } } catch (final NumberFormatException e) { ! StendhalUI.get().addEventLine("Invalid number: " + str); return true; } --- 51,55 ---- } } catch (final NumberFormatException e) { ! StendhalUI.get().addEventLine(new StandardEventLine("Invalid number: " + str)); return true; } Index: SummonAtAction.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/actions/SummonAtAction.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SummonAtAction.java 12 Jul 2008 14:43:42 -0000 1.8 --- SummonAtAction.java 14 Oct 2008 07:12:21 -0000 1.9 *************** *** 3,6 **** --- 3,7 ---- import games.stendhal.client.StendhalClient; import games.stendhal.client.StendhalUI; + import games.stendhal.client.gui.chatlog.StandardEventLine; import games.stendhal.common.Grammar; import marauroa.common.game.RPAction; *************** *** 37,41 **** amount = Integer.parseInt(params[2]); } catch (final NumberFormatException ex) { ! StendhalUI.get().addEventLine("Invalid amount: " + params[2]); return true; } --- 38,42 ---- amount = Integer.parseInt(params[2]); } catch (final NumberFormatException ex) { ! StendhalUI.get().addEventLine(new StandardEventLine("Invalid amount: " + params[2])); return true; } Index: GMHelpAction.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/actions/GMHelpAction.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** GMHelpAction.java 24 Sep 2008 22:09:36 -0000 1.17 --- GMHelpAction.java 14 Oct 2008 07:12:21 -0000 1.18 *************** *** 2,5 **** --- 2,6 ---- import games.stendhal.client.StendhalUI; + import games.stendhal.client.gui.chatlog.HeaderLessEventLine; import games.stendhal.common.NotificationType; *************** *** 42,46 **** for (final String line : lines) { ! StendhalUI.get().addEventLine(line, NotificationType.CLIENT); } --- 43,47 ---- for (final String line : lines) { ! StendhalUI.get().addEventLine(new HeaderLessEventLine(line, NotificationType.CLIENT)); } Index: GMHelpScriptAction.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/actions/GMHelpScriptAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GMHelpScriptAction.java 24 Sep 2008 22:09:13 -0000 1.2 --- GMHelpScriptAction.java 14 Oct 2008 07:12:21 -0000 1.3 *************** *** 2,5 **** --- 2,6 ---- import games.stendhal.client.StendhalUI; + import games.stendhal.client.gui.chatlog.HeaderLessEventLine; import games.stendhal.common.NotificationType; *************** *** 41,45 **** for (final String line : lines) { ! StendhalUI.get().addEventLine(line, NotificationType.CLIENT); } --- 42,46 ---- for (final String line : lines) { ! StendhalUI.get().addEventLine(new HeaderLessEventLine(line, NotificationType.CLIENT)); } Index: GMHelpAlterAction.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/actions/GMHelpAlterAction.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GMHelpAlterAction.java 12 Jul 2008 14:43:42 -0000 1.7 --- GMHelpAlterAction.java 14 Oct 2008 07:12:21 -0000 1.8 *************** *** 2,5 **** --- 2,6 ---- import games.stendhal.client.StendhalUI; + import games.stendhal.client.gui.chatlog.HeaderLessEventLine; import games.stendhal.common.NotificationType; *************** *** 29,33 **** for (final String line : lines) { ! StendhalUI.get().addEventLine(line, NotificationType.CLIENT); } --- 30,34 ---- for (final String line : lines) { ! StendhalUI.get().addEventLine(new HeaderLessEventLine(line, NotificationType.CLIENT)); } Index: DropAction.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/actions/DropAction.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** DropAction.java 12 Jul 2008 14:43:42 -0000 1.22 --- DropAction.java 14 Oct 2008 07:12:21 -0000 1.23 *************** *** 4,7 **** --- 4,8 ---- import games.stendhal.client.StendhalUI; import games.stendhal.client.entity.User; + import games.stendhal.client.gui.chatlog.StandardEventLine; import games.stendhal.common.Constants; import games.stendhal.common.EquipActionConsts; *************** *** 33,37 **** quantity = Integer.parseInt(params[0]); } catch (final NumberFormatException ex) { ! StendhalUI.get().addEventLine("Invalid quantity: " + params[0]); return true; } --- 34,38 ---- quantity = Integer.parseInt(params[0]); } catch (final NumberFormatException ex) { ! StendhalUI.get().addEventLine(new StandardEventLine("Invalid quantity: " + params[0])); return true; } *************** *** 68,73 **** } } ! ! StendhalUI.get().addEventLine("You don't have any " + singularItemName); return true; } --- 69,73 ---- } } ! StendhalUI.get().addEventLine(new StandardEventLine("You don't have any " + singularItemName)); return true; } |