diff --git a/trunk/src/go.hoteas.com/hotime/.idea/workspace.xml b/trunk/src/go.hoteas.com/hotime/.idea/workspace.xml
index ccc91c1..08ff162 100644
--- a/trunk/src/go.hoteas.com/hotime/.idea/workspace.xml
+++ b/trunk/src/go.hoteas.com/hotime/.idea/workspace.xml
@@ -4,9 +4,7 @@
<bookmark url="file://$PROJECT_DIR$/var.go" line="12" />
</component>
<component name="ChangeListManager">
- <list default="true" readonly="true" id="03ed5703-81a1-441b-849c-c426276586b7" name="Default" comment="">
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- </list>
+ <list default="true" readonly="true" id="03ed5703-81a1-441b-849c-c426276586b7" name="Default" comment="" />
<ignored path=".idea/dataSources.local.xml" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@@ -26,8 +24,8 @@
<file leaf-file-name="main.go" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/example/main.go">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="15">
- <caret line="55" column="59" lean-forward="false" selection-start-line="55" selection-start-column="59" selection-end-line="55" selection-end-column="59" />
+ <state relative-caret-position="705">
+ <caret line="92" column="32" lean-forward="false" selection-start-line="92" selection-start-column="32" selection-end-line="92" selection-end-column="32" />
<folding>
<element signature="e#14#209#0" expanded="true" />
</folding>
@@ -35,11 +33,21 @@
</provider>
</entry>
</file>
- <file leaf-file-name="type.go" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/type.go">
+ <file leaf-file-name="config.json" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/example/config/config.json">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
- <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="13" />
+ <state relative-caret-position="210">
+ <caret line="14" column="17" lean-forward="false" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/example/tpt/index.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="285">
+ <caret line="19" column="10" lean-forward="false" selection-start-line="19" selection-start-column="10" selection-end-line="19" selection-end-column="10" />
<folding />
</state>
</provider>
@@ -117,16 +125,6 @@
</provider>
</entry>
</file>
- <file leaf-file-name="func.go" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/func.go">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@@ -214,10 +212,9 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="6">
- <option name="x" value="-673" />
- <option name="y" value="310" />
- <option name="width" value="1873" />
- <option name="height" value="1084" />
+ <option name="x" value="55" />
+ <option name="width" value="943" />
+ <option name="height" value="1087" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
@@ -234,8 +231,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="AndroidView" />
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -269,8 +264,10 @@
<select />
</subPane>
</pane>
- <pane id="Scratches" />
+ <pane id="Scope" />
+ <pane id="AndroidView" />
<pane id="PackagesPane" />
+ <pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -478,6 +475,7 @@
<workItem from="1523202491878" duration="853000" />
<workItem from="1523288830673" duration="6214000" />
<workItem from="1523341635238" duration="10000" />
+ <workItem from="1523384832228" duration="740000" />
</task>
<task id="LOCAL-00001">
<created>1500458878821</created>
@@ -707,7 +705,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="107747000" />
+ <option name="totallyTimeSpent" value="108487000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -728,18 +726,18 @@
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32395834" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6322917" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.328125" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32805908" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22877619" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23153253" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24972437" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3997923" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Debug Logs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -773,6 +771,14 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/func.go">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/example/main.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -1070,20 +1076,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/example/config/config.json">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
- <caret line="14" column="17" lean-forward="false" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/example/tpt/index.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/var.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -1166,10 +1158,26 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/example/config/config.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="210">
+ <caret line="14" column="17" lean-forward="false" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/example/tpt/index.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="285">
+ <caret line="19" column="10" lean-forward="false" selection-start-line="19" selection-start-column="10" selection-end-line="19" selection-end-column="10" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/example/main.go">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="15">
- <caret line="55" column="59" lean-forward="false" selection-start-line="55" selection-start-column="59" selection-end-line="55" selection-end-column="59" />
+ <state relative-caret-position="705">
+ <caret line="92" column="32" lean-forward="false" selection-start-line="92" selection-start-column="32" selection-end-line="92" selection-end-column="32" />
<folding>
<element signature="e#14#209#0" expanded="true" />
</folding>
diff --git a/trunk/src/go.hoteas.com/hotime/session.go b/trunk/src/go.hoteas.com/hotime/session.go
index 58b92cc..13f1b5a 100644
--- a/trunk/src/go.hoteas.com/hotime/session.go
+++ b/trunk/src/go.hoteas.com/hotime/session.go
@@ -12,10 +12,10 @@ type SessionIns struct {
func (this *SessionIns) set() {
if this.ShortCache != nil {
- this.ShortCache.Cache(this.SessionId, this.Map)
+ this.ShortCache.Cache(HEAD_SESSION_ADD + this.SessionId, this.Map)
}
if this.LongCache != nil {
- this.LongCache.Cache(this.SessionId, this.Map)
+ this.LongCache.Cache(HEAD_SESSION_ADD + this.SessionId, this.Map)
}
}