From f7b55a04e35438d015e3e820b8c66045f20bcc9f Mon Sep 17 00:00:00 2001
From: mjy <343600373@qq.com>
Date: Mon, 28 Oct 2013 15:08:02 +0800
Subject: [PATCH 01/60] =?UTF-8?q?=E6=94=AF=E6=8C=812013.10.28=E6=9C=80?=
=?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=EF=BC=8C=E6=94=AF=E6=8C=8130?=
=?UTF-8?q?=E7=BA=A7=E4=BB=A5=E4=B8=8B=E7=8E=A9=E5=AE=B60AP=E8=B7=91?=
=?UTF-8?q?=E5=9B=BE=E6=B4=BB=E5=8A=A8=EF=BC=8C=E6=94=AF=E6=8C=81=E8=B7=91?=
=?UTF-8?q?=E6=9C=80=E4=BD=8EAP=E5=9B=BE=EF=BC=88=E4=B8=8D=E4=B8=80?=
=?UTF-8?q?=E5=AE=9A=E6=98=AF0AP=EF=BC=89=20=E4=B8=80=E4=BA=9B=E8=BE=93?=
=?UTF-8?q?=E5=87=BA=E7=9A=84=E6=B1=89=E5=8C=96=EF=BC=8C=E4=B8=80=E4=BA=9B?=
=?UTF-8?q?=E8=B7=91=E5=9B=BE=E9=80=BB=E8=BE=91=E7=9A=84=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E3=80=82=20=E4=BD=BF=E7=94=A8=E6=AD=A4=E7=89=88=E6=9C=AC?=
=?UTF-8?q?=E9=9C=80=E6=9B=B4=E6=96=B0c.xml=E6=96=87=E4=BB=B6=EF=BC=8C?=
=?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E6=96=87=E4=BB=B6=E4=B8=8D=E8=83=BD?=
=?UTF-8?q?=E7=94=A8=E4=BA=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
action/AddArea.java | 1 -
action/GetFloorInfo.java | 7 ++++---
c.xml | 6 +++---
walker/GetConfig.java | 4 ++--
walker/Info.java | 7 ++++---
walker/Process.java | 18 +++++++++---------
walker/Think.java | 16 +++++++---------
walker/Version.java | 4 ++--
8 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/action/AddArea.java b/action/AddArea.java
index f5cf9e4..5a87feb 100644
--- a/action/AddArea.java
+++ b/action/AddArea.java
@@ -77,7 +77,6 @@ public static boolean run() throws Exception {
Process.info.AllClear = true;
if (newArea.areaId != -1) GetFloorInfo.getFloor(newArea);
-
} catch (Exception ex) {
if (ErrorData.currentErrorType == ErrorData.ErrorType.none) {
throw ex;
diff --git a/action/GetFloorInfo.java b/action/GetFloorInfo.java
index 0a00ba6..45efc50 100644
--- a/action/GetFloorInfo.java
+++ b/action/GetFloorInfo.java
@@ -4,7 +4,6 @@
import info.Floor;
import java.util.ArrayList;
-//import java.util.Hashtable;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
@@ -16,6 +15,7 @@
import org.w3c.dom.NodeList;
import walker.ErrorData;
+import walker.Info;
import walker.Process;
import action.ActionRegistry.Action;
@@ -80,9 +80,10 @@ public static boolean run() throws Exception {
for (int i : Process.info.area.keySet()) {
getFloor(Process.info.area.get(i));
} // end of area iterator
- if (Process.info.front == null) Process.info.front = Process.info.floor.get(1);
- Process.info.SetTimeoutByAction(Name);
+ int floor = ((Info.MinAPOnly == true) ? Process.info.floor.firstKey() : Process.info.floor.lastKey());
+ if (Process.info.front == null) Process.info.front = Process.info.floor.get(floor);
+ Process.info.SetTimeoutByAction(Name);
} catch (Exception ex) {
if (ErrorData.currentErrorType == ErrorData.ErrorType.none) {
throw ex;
diff --git a/c.xml b/c.xml
index 5bbbec3..bc696d1 100644
--- a/c.xml
+++ b/c.xml
@@ -7,7 +7,7 @@