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

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

Revision: 389
          http://svn.sourceforge.net/gridarta/?rev=389&view=rev
Author:   akirschbaum
Date:     2006-09-24 08:27:44 -0700 (Sun, 24 Sep 2006)

Log Message:
-----------
Some unification changes.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CAttribDialog.java
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/crossfire/src/cfeditor/CMapArchPanel.java
    trunk/crossfire/src/cfeditor/CopyBuffer.java
    trunk/crossfire/src/cfeditor/arch/ArchObjectParser.java
    trunk/daimonin/src/daieditor/CArchQuickView.java
    trunk/daimonin/src/daieditor/MultiPositionData.java
    trunk/daimonin/src/daieditor/ReplaceDialog.java
    trunk/daimonin/src/daieditor/arch/ArchObjectParser.java

Modified: trunk/crossfire/src/cfeditor/CAttribDialog.java
===================================================================

--- trunk/crossfire/src/cfeditor/CAttribDialog.java	2006-09-24 14:41:10 UTC (rev 388)
+++ trunk/crossfire/src/cfeditor/CAttribDialog.java	2006-09-24 15:27:44 UTC (rev 389)
@@ -159,7 +159,7 @@
      * @param defaobj the default ArchObject of 'arch'
      * @param mainControl  main control
      */
-    CAttribDialog(final CFArchTypeList atList, final ArchObject aobj, final ArchObject defaobj, final CMainControl mainControl) {
+    CAttribDialog(final CFArchTypeList atList, final ArchObject aobj, final CMainControl mainControl) {
         super(mainControl.getMainView(), "CF Attribute Dialog", false);
 
         // when close-box is selected, execute the 'closeDialog' method and nothing else
@@ -179,13 +179,8 @@
         CAttribDialog.setDefaultBounds();          // set width/height etc
 
         // reference to the ArchObject
-        if (aobj.isTail()) {
-            arch = aobj.getHead();
-            defarch = this.mainControl.getArchObjectStack().getArch(arch.getNodeNr());
-        } else {
-            arch = aobj;
-            defarch = defaobj;     // reference to the default ArchObject
-        }
+        arch = aobj.getHead();
+        defarch = arch.getDefaultArch();
 
         /* set frame icon
         if (arch.getFaceNr() >= 0) {

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2006-09-24 14:41:10 UTC (rev 388)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2006-09-24 15:27:44 UTC (rev 389)
@@ -1019,7 +1019,7 @@
             // types.txt is missing!
             showMessage("File Missing", "The definitions-file \"types.txt\" is missing! The\nattribute interface doesn't work without that file.");
         } else if (arch != null && arch.getNodeNr() != -1) {
-            final CAttribDialog dwin = new CAttribDialog(typelist, arch, getArch(arch.getNodeNr()), this);
+            final CAttribDialog dwin = new CAttribDialog(typelist, arch, this);
         }
     }
 

Modified: trunk/crossfire/src/cfeditor/CMapArchPanel.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapArchPanel.java	2006-09-24 14:41:10 UTC (rev 388)
+++ trunk/crossfire/src/cfeditor/CMapArchPanel.java	2006-09-24 15:27:44 UTC (rev 389)
@@ -267,7 +267,7 @@
                 }
 
                 // no single tile?
-                if (arch.isMulti() || arch.isTail()) {
+                if (arch.isMulti()) {
                     return;
                 }
 
@@ -776,7 +776,7 @@
         }
 
         // check for multi tile
-        if (arch.isMulti() || arch.isTail()) {
+        if (arch.isMulti()) {
             // multi: print size
             archTileText.setText("Tile: " + arch.getSizeX() + "x" + arch.getSizeY());
         } else {

Modified: trunk/crossfire/src/cfeditor/CopyBuffer.java
===================================================================
--- trunk/crossfire/src/cfeditor/CopyBuffer.java	2006-09-24 14:41:10 UTC (rev 388)
+++ trunk/crossfire/src/cfeditor/CopyBuffer.java	2006-09-24 15:27:44 UTC (rev 389)
@@ -364,18 +364,17 @@
             for (ArchObject tmp = arch.getDefaultArch().getMultiNext(); tmp != null; tmp = tmp.getMultiNext()) {
                 final ArchObject newTail = mainControl.getArchObjectStack().newArchObjectInstance(tmp.getNodeNr());
 
-                final int mapx = pos.x + newTail.getMultiX();
-                final int mapy = pos.y + newTail.getMultiY();
+                final Point mapPos = new Point(pos.x + newTail.getMultiX(), pos.y + newTail.getMultiY());
 
-                if (!mapControl.isPointValid(mapx, mapy)) {
+                if (!mapControl.isPointValid(mapPos)) {
                     // outside map
                    return;
                 }
 
                 newTail.setMultiX(tmp.getMultiX());
                 newTail.setMultiY(tmp.getMultiY());
-                newTail.setMapX(mapx);
-                newTail.setMapY(mapy);
+                newTail.setMapX(mapPos.x);
+                newTail.setMapY(mapPos.y);
                 newHead.addTailPart(newTail);
             }
 

Modified: trunk/crossfire/src/cfeditor/arch/ArchObjectParser.java
===================================================================
--- trunk/crossfire/src/cfeditor/arch/ArchObjectParser.java	2006-09-24 14:41:10 UTC (rev 388)
+++ trunk/crossfire/src/cfeditor/arch/ArchObjectParser.java	2006-09-24 15:27:44 UTC (rev 389)
@@ -566,7 +566,7 @@
         final ArchObject defarch = mainControl.getArch(arch.getNodeNr());  // default arch
 
         // is it a multi head?
-        if (defarch != null && defarch.isMulti() && !arch.isMulti()) {
+        if (defarch != null && defarch.isMulti() && arch.getMultiRefCount() <= 1) {
             // we have a multi head and need to insert his tail now
 
             // do insertion for all non-head parts of the multi

Modified: trunk/daimonin/src/daieditor/CArchQuickView.java
===================================================================
--- trunk/daimonin/src/daieditor/CArchQuickView.java	2006-09-24 14:41:10 UTC (rev 388)
+++ trunk/daimonin/src/daieditor/CArchQuickView.java	2006-09-24 15:27:44 UTC (rev 389)
@@ -129,7 +129,7 @@
 
             archTypeText.setText(mainControl.getTypeList().getArchTypeName(arch.getArchTypNr()) + " (" + arch.getArchTypNr() + ')');
 
-            if (arch.getMultiRefCount() > 0) {
+            if (arch.isMulti()) {
                 archTileText.setText("<html><span style=\"color:green;\"> multi</span> (" + arch.getMultiRefCount() + " parts) (" + arch.getSizeX() + ',' + arch.getSizeY() + ")</html>");
             } else {
                 archTileText.setText("single");

Modified: trunk/daimonin/src/daieditor/MultiPositionData.java
===================================================================
--- trunk/daimonin/src/daieditor/MultiPositionData.java	2006-09-24 14:41:10 UTC (rev 388)
+++ trunk/daimonin/src/daieditor/MultiPositionData.java	2006-09-24 15:27:44 UTC (rev 389)
@@ -46,7 +46,7 @@
 
     public static final int Y_DIM = 16;
 
-    private static MultiPositionData instance;
+    private static MultiPositionData instance = null;
 
     /** array with position data */
     private final int[][] data;

Modified: trunk/daimonin/src/daieditor/ReplaceDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/ReplaceDialog.java	2006-09-24 14:41:10 UTC (rev 388)
+++ trunk/daimonin/src/daieditor/ReplaceDialog.java	2006-09-24 15:27:44 UTC (rev 389)
@@ -315,7 +315,7 @@
         final int replaceListSize = replaceList == null ? 0 : replaceList.size();
         for (MapSquare square : entireMap ? mapControl.getMapModel() : mapViewIFrame.getView().getSelectedSquares()) {
             for (ArchObject node : square) {
-                if ((!node.isMulti() || node.isHead())
+                if (!node.isMulti()
                         && (matchCriteria == MATCH_ARCH_NAME && node.getArchName() != null && node.getArchName().equalsIgnoreCase(matchString)
                         || matchCriteria == MATCH_OBJ_NAME && node.getBestName().equalsIgnoreCase(matchString))) {
                     if (replaceListSize > 0 && !deleteOnly) {

Modified: trunk/daimonin/src/daieditor/arch/ArchObjectParser.java
===================================================================
--- trunk/daimonin/src/daieditor/arch/ArchObjectParser.java	2006-09-24 14:41:10 UTC (rev 388)
+++ trunk/daimonin/src/daieditor/arch/ArchObjectParser.java	2006-09-24 15:27:44 UTC (rev 389)
@@ -560,6 +560,7 @@
 
         // is it a multi head?
         if (defarch != null && defarch.isMulti() && arch.getMultiRefCount() <= 1) {
+            // we have a multi head and need to insert his tail now
 
             // do insertion for all non-head parts of the multi
             for (ArchObject oldPart = defarch.getMultiNext(); oldPart != null; oldPart = oldPart.getMultiNext()) {


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: [389] trunk (Page 2)

gridarta-commit