Thread: [Gridarta-commit] SF.net SVN: gridarta:[7917] trunk (Page 50)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7917
          http://gridarta.svn.sourceforge.net/gridarta/?rev=7917&view=rev
Author:   akirschbaum
Date:     2010-05-23 12:37:46 +0000 (Sun, 23 May 2010)

Log Message:
-----------
Implement #1717845 (Multitile paste) as File|Paste Tiled: paste the copy buffer into the selection. If the selection is larger than the copy buffer, tiling happens.

Modified Paths:
--------------
    trunk/atrinik/ChangeLog
    trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
    trunk/crossfire/ChangeLog
    trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
    trunk/daimonin/ChangeLog
    trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
    trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java
    trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
    trunk/src/app/net/sf/gridarta/messages.properties
    trunk/src/app/net/sf/gridarta/messages_de.properties
    trunk/src/app/net/sf/gridarta/messages_fr.properties
    trunk/src/app/net/sf/gridarta/messages_sv.properties

Added Paths:
-----------
    trunk/src/app/net/sf/gridarta/utils/MathUtils.java

Modified: trunk/atrinik/ChangeLog
===================================================================

--- trunk/atrinik/ChangeLog	2010-05-23 12:08:06 UTC (rev 7916)
+++ trunk/atrinik/ChangeLog	2010-05-23 12:37:46 UTC (rev 7917)
@@ -1,3 +1,9 @@
+2010-05-23  Andreas Kirschbaum
+
+	* Implement #1717845 (Multitile paste) as File|Paste Tiled: paste
+	the copy buffer into the selection. If the selection is larger
+	than the copy buffer, tiling happens.
+
 2010-05-22  Andreas Kirschbaum
 
 	* Fix "Generate Preview" to regenerate previews for all selected

Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties	2010-05-23 12:08:06 UTC (rev 7916)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties	2010-05-23 12:37:46 UTC (rev 7917)
@@ -26,7 +26,7 @@
 # Menus
 main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
 file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options shortcuts - exit
-edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection
+edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection
 map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
 archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
 #pickmaps.menu: See gridarta
@@ -41,7 +41,7 @@
 mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
 
 mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - closeMap
-mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection
+mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection
 mapwindowMap.menu=gridVisible enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
 mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
 

Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog	2010-05-23 12:08:06 UTC (rev 7916)
+++ trunk/crossfire/ChangeLog	2010-05-23 12:37:46 UTC (rev 7917)
@@ -1,3 +1,9 @@
+2010-05-23  Andreas Kirschbaum
+
+	* Implement #1717845 (Multitile paste) as File|Paste Tiled: paste
+	the copy buffer into the selection. If the selection is larger
+	than the copy buffer, tiling happens.
+
 2010-05-22  Andreas Kirschbaum
 
 	* Fix "Generate Preview" to regenerate previews for all selected

Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties	2010-05-23 12:08:06 UTC (rev 7916)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties	2010-05-23 12:37:46 UTC (rev 7917)
@@ -26,7 +26,7 @@
 # Menus
 main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
 file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options shortcuts - exit
-edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection
+edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection
 map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
 archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
 #pickmaps.menu: See gridarta
@@ -41,7 +41,7 @@
 mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
 
 mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - closeMap
-mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection
+mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection
 mapwindowMap.menu=gridVisible smoothing enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
 mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
 

Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog	2010-05-23 12:08:06 UTC (rev 7916)
+++ trunk/daimonin/ChangeLog	2010-05-23 12:37:46 UTC (rev 7917)
@@ -1,3 +1,9 @@
+2010-05-23  Andreas Kirschbaum
+
+	* Implement #1717845 (Multitile paste) as File|Paste Tiled: paste
+	the copy buffer into the selection. If the selection is larger
+	than the copy buffer, tiling happens.
+
 2010-05-22  Andreas Kirschbaum
 
 	* Fix "Generate Preview" to regenerate previews for all selected

Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties	2010-05-23 12:08:06 UTC (rev 7916)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties	2010-05-23 12:37:46 UTC (rev 7917)
@@ -26,7 +26,7 @@
 # Menus
 main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
 file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options shortcuts - exit
-edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection
+edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection
 map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
 archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
 #pickmaps.menu: See gridarta
@@ -41,7 +41,7 @@
 mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
 
 mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - closeMap
-mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection
+mapwindowEdit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection
 mapwindowMap.menu=gridVisible enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
 mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
 

Modified: trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java	2010-05-23 12:08:06 UTC (rev 7916)
+++ trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java	2010-05-23 12:37:46 UTC (rev 7917)
@@ -37,6 +37,7 @@
 import net.sf.gridarta.model.map.mapmodel.MapModelListener;
 import net.sf.gridarta.model.map.mapmodel.MapSquare;
 import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
+import net.sf.gridarta.utils.MathUtils;
 import net.sf.gridarta.utils.Size2D;
 import org.jetbrains.annotations.NotNull;
 
@@ -175,7 +176,6 @@
      * Executing the Paste command.
      * @param mapView the map view to paste on
      * @param startLocation the location to paste into
-     * @todo paste only sub-regions when a region is selected
      */
     public void paste(@NotNull final MapView<G, A, R> mapView, @NotNull final Point startLocation) {
         final MapModel<G, A, R> mapModel2 = mapView.getMapControl().getMapModel();
@@ -210,6 +210,49 @@
     }
 
     /**
+     * Executing the Paste Tiled command.
+     * @param mapView the map view to paste on
+     * @param selectedSquares the square to paste into
+     * @param origin the origin where to start pasting
+     */
+    public void pasteTiled(@NotNull final MapView<G, A, R> mapView, @NotNull final Iterable<MapSquare<G, A, R>> selectedSquares, @NotNull final Point origin) {
+        final Point sourcePoint = new Point();
+        final Point destinationPoint = new Point();
+        final MapModel<G, A, R> mapModel2 = mapView.getMapControl().getMapModel();
+        final Size2D mapModelSize = mapModel.getMapSize();
+        mapModel2.beginTransaction("Paste"); // TODO: I18N/L10N
+        try {
+            for (final MapSquare<G, A, R> destinationMapSquare : selectedSquares) {
+                sourcePoint.x = MathUtils.mod(destinationMapSquare.getMapX() - origin.x, mapModelSize.getWidth());
+                sourcePoint.y = MathUtils.mod(destinationMapSquare.getMapY() - origin.y, mapModelSize.getHeight());
+                final MapSquare<G, A, R> sourceMapSquare = mapModel.getMapSquare(sourcePoint);
+                for (final BaseObject<G, A, R, ?> gameObject : sourceMapSquare) {
+                    if (!gameObject.isMulti()) {
+                        destinationPoint.x = destinationMapSquare.getMapX();
+                        destinationPoint.y = destinationMapSquare.getMapY();
+                        mapModel2.addCopyToMap(gameObject, destinationPoint, true, insertionModeSet.getTopmostInsertionMode());
+                    }
+                }
+            }
+
+            for (final MapSquare<G, A, R> destinationMapSquare : selectedSquares) {
+                sourcePoint.x = MathUtils.mod(destinationMapSquare.getMapX() - origin.x, mapModelSize.getWidth());
+                sourcePoint.y = MathUtils.mod(destinationMapSquare.getMapY() - origin.y, mapModelSize.getHeight());
+                final MapSquare<G, A, R> sourceMapSquare = mapModel.getMapSquare(sourcePoint);
+                for (final BaseObject<G, A, R, ?> gameObject : sourceMapSquare) {
+                    if (gameObject.isMulti()) {
+                        destinationPoint.x = destinationMapSquare.getMapX();
+                        destinationPoint.y = destinationMapSquare.getMapY();
+                        mapModel2.addCopyToMap(gameObject, destinationPoint, true, insertionModeSet.getTopmostInsertionMode());
+                    }
+                }
+            }
+        } finally {
+            mapModel2.endTransaction();
+        }
+    }
+
+    /**
      * Return all game objects. Only top-level head parts are returned; tail
      * parts are ignored as are objects in inventories.
      * @return all game objects

Modified: trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mainactions/MainActions.java	2010-05-23 12:08:06 UTC (rev 7916)
+++ trunk/src/app/net/sf/gridarta/mainactions/MainActions.java	2010-05-23 12:37:46 UTC (rev 7917)
@@ -245,6 +245,12 @@
     private final Action aPaste;
 
     /**
+     * Action called for "paste tiled".
+     */
+    @NotNull
+    private final Action aPasteTiled;
+
+    /**
      * Action called for "replace".
      */
     @NotNull
@@ -429,6 +435,7 @@
         aCut = ActionUtils.newAction(ACTION_BUILDER, "Copy Buffer", this, "cut");
         aCopy = ActionUtils.newAction(ACTION_BUILDER, "Copy Buffer", this, "copy");
         aPaste = ActionUtils.newAction(ACTION_BUILDER, "Copy Buffer", this, "paste");
+        aPasteTiled = ActionUtils.newAction(ACTION_BUILDER, "Copy Buffer", this, "pasteTiled");
         aShiftNorth = ActionUtils.newAction(ACTION_BUILDER, "Map/Shift", this, "shiftNorth");
         aShiftNorthEast = ActionUtils.newAction(ACTION_BUILDER, "Map/Shift", this, "shiftNorthEast");
         aShiftEast = ActionUtils.newAction(ACTION_BUILDER, "Map/Shift", this, "shiftEast");
@@ -664,6 +671,7 @@
         aCut.setEnabled(doCut(false));
         aCopy.setEnabled(doCopy(false));
         aPaste.setEnabled(doPaste(false));
+        aPasteTiled.setEnabled(doPasteTiled(false));
         aShiftNorth.setEnabled(doShift(false, 0));
         aShiftNorthEast.setEnabled(doShift(false, 4));
         aShiftEast.setEnabled(doShift(false, 1));
@@ -722,6 +730,14 @@
     }
 
     /**
+     * "Paste Tiled" was selected from the Edit menu.
+     */
+    @ActionMethod
+    public void pasteTiled() {
+        doPasteTiled(true);
+    }
+
+    /**
      * "Shift North" was selected from the Edit menu.
      */
     @ActionMethod
@@ -1031,6 +1047,48 @@
     }
 
     /**
+     * Executes the "paste tiled" action.
+     * @param performAction whether the action should be performed
+     * @return whether the action was or can be performed
+     */
+    private boolean doPasteTiled(final boolean performAction) {
+        final MapView<G, A, R> mapView = currentMapView;
+        if (mapView == null) {
+            return false;
+        }
+
+        final Point startLocation = mapView.getMapViewBasic().getMapCursor().getLocation();
+        if (startLocation == null) {
+            return false;
+        }
+
+        if (copyBuffer.isEmpty()) {
+            return false;
+        }
+
+        final MapViewBasic<G,A,R> mapViewBasic = mapView.getMapViewBasic();
+        final List<MapSquare<G, A, R>> selectedSquares = mapViewBasic.getSelectedSquares();
+        if (selectedSquares.isEmpty()) {
+            return false;
+        }
+
+        final MapGrid mapGrid = mapViewBasic.getMapGrid();
+        final Rectangle selectedRec = mapGrid.getSelectedRec();
+        if (selectedRec == null) {
+            return false;
+        }
+
+        if (performAction) {
+            final MapCursor mapCursor = mapViewBasic.getMapCursor();
+            final Point cursorLocation = mapCursor.getLocation();
+            final Point origin = cursorLocation == null ? selectedRec.getLocation() : cursorLocation;
+            copyBuffer.pasteTiled(mapView, selectedSquares, origin);
+        }
+
+        return true;
+    }
+
+    /**
      * Executes the "shift" action.
      * @param performAction whether the action should be performed
      * @param direction the direction to shift

Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties	2010-05-23 12:08:06 UTC (rev 7916)
+++ trunk/src/app/net/sf/gridarta/messages.properties	2010-05-23 12:37:46 UTC (rev 7917)
@@ -724,6 +724,10 @@
 paste.shortdescription=Pastes the clipboard to map cursor.
 paste.accel=ctrl pressed V
 
+pasteTiled.text=Paste Tiled
+pasteTiled.shortdescription=Pastes the clipboard to selected map squares.
+pasteTiled.longdescription=Pastes the clipboard to selected map squares. Pastes the clipboard as tiles if the clipboard''s size is smaller than the selected area.
+
 shift.text=Shift
 shift.shortdescription=Shifts the selected squares.
 shift.mnemonic=H

Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties	2010-05-23 12:08:06 UTC (rev 7916)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties	2010-05-23 12:37:46 UTC (rev 7917)
@@ -679,6 +679,10 @@
 paste.mnemonic=E
 paste.shortdescription=Kopiert die Zwischenablage an das Cursor-Feld.
 
+pasteTiled=Gekachelt einf\xFCgen
+pasteTiled.shortdescription=Kopiert die Zwischenablage in die ausgew\xE4hlten Felder.
+pasteTiled.longdescription=Kopiert die Zwischenablage in die ausgew\xE4hlten Felder. Falls the Zwischenablage kleiner als die ausgew\xE4hlten Felder ist, wird gekachelt.
+
 shift.text=Verschieben
 shift.mnemonic=V
 shift.shortdescription=Verschiebt die ausgew\xE4hlten Felder.

Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties	2010-05-23 12:08:06 UTC (rev 7916)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties	2010-05-23 12:37:46 UTC (rev 7917)
@@ -671,6 +671,10 @@
 paste.mnemonic=L
 #paste.shortdescription=
 
+#pasteTiled.text=
+#pasteTiled.shortdescription=
+#pasteTiled.longdescription=
+
 #shift.text=
 shift.mnemonic=S
 #shift.shortdescription=

Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties	2010-05-23 12:08:06 UTC (rev 7916)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties	2010-05-23 12:37:46 UTC (rev 7917)
@@ -677,6 +677,10 @@
 paste.mnemonic=L
 #paste.shortdescription=
 
+#pasteTiled.text=
+#pasteTiled.shortdescription=
+#pasteTiled.longdescription=
+
 #shift.text=
 #shift.mnemonic=
 #shift.shortdescription=

Added: trunk/src/app/net/sf/gridarta/utils/MathUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/utils/MathUtils.java	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/utils/MathUtils.java	2010-05-23 12:37:46 UTC (rev 7917)
@@ -0,0 +1,47 @@
+/*
+ * This file is part of JXClient, the Fullscreen Java Crossfire Client.
+ *
+ * JXClient is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * JXClient is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with JXClient; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Copyright (C) 2005-2008 Yann Chachkoff.
+ * Copyright (C) 2006-2010 Andreas Kirschbaum.
+ */
+
+package net.sf.gridarta.utils;
+
+/**
+ * Utility class for mathematical functions.
+ * @author Andreas Kirschbaum
+ */
+public class MathUtils {
+
+    /**
+     * Private constructor to prevent instantiation.
+     */
+    private MathUtils() {
+    }
+
+    /**
+     * Calculates the remainder of <code>a/b</code>.
+     * @param numerator the numerator
+     * @param denominator the denominator
+     * @return the quotient
+     */
+    public static int mod(final int numerator, final int denominator) {
+        final int result = numerator % denominator;
+        return result < 0 ? result + denominator : result;
+    }
+
+} // class MathUtils


Property changes on: trunk/src/app/net/sf/gridarta/utils/MathUtils.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Gridarta-commit] SF.net SVN: gridarta:[7917] trunk (Page 50)

gridarta-commit