[Gridarta-commit] SF.net SVN: gridarta: [1133] trunk

[<aki...@us...>]

Revision: 1133
          http://svn.sourceforge.net/gridarta/?rev=1133&view=rev
Author:   akirschbaum
Date:     2006-12-17 04:44:17 -0800 (Sun, 17 Dec 2006)

Log Message:
-----------
Unify code.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CopyBuffer.java
    trunk/daimonin/src/daieditor/CopyBuffer.java

Modified: trunk/crossfire/src/cfeditor/CopyBuffer.java
===================================================================
--- trunk/crossfire/src/cfeditor/CopyBuffer.java	2006-12-17 12:36:33 UTC (rev 1132)
+++ trunk/crossfire/src/cfeditor/CopyBuffer.java	2006-12-17 12:44:17 UTC (rev 1133)
@@ -239,14 +239,14 @@
      * @todo the fill density is ignored for floodfill
      */
     public void fill(final MapControl mapControl, final boolean fillBelow, final int density) {
+        if (!mapControl.getMapViewFrame().isHighlight()) {
+            return; // should actually never happen
+        }
+
         final Rectangle selRec = mapControl.getMapGrid().getSelectedRec();;
         final Point cursor = mapControl.getMapViewFrame().getView().getCursorPosition();
         final Point pos = new Point();
 
-        if (!mapControl.getMapViewFrame().isHighlight()) {
-            return; // should actually never happen
-        }
-
         if (mainControl.getArchPanelHighlight() == null) { // no selected arch to fill with
             return;
         }

Modified: trunk/daimonin/src/daieditor/CopyBuffer.java
===================================================================
--- trunk/daimonin/src/daieditor/CopyBuffer.java	2006-12-17 12:36:33 UTC (rev 1132)
+++ trunk/daimonin/src/daieditor/CopyBuffer.java	2006-12-17 12:44:17 UTC (rev 1133)
@@ -237,7 +237,6 @@
      * @param rand  Percentage of filling (e.g. 100 for 100%, 10 for 10%).
      */
     public void fill(final MapControl mapControl, final boolean fillBelow, final MapControl seed, final int rand) {
-
         if (!mapControl.getMapViewFrame().isHighlight()) {
             return; // should actually never happen
         }


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