--- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,10 +2,6 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" name="Default" comment=""> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/compiler.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/copyright/profiles_settings.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/404.html" afterPath="$PROJECT_DIR$/404.html" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/Chart.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/Chart.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/Color.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/Color.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/Flotr.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/Flotr.js" /> @@ -13,55 +9,41 @@ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/lib/base64.js" afterPath="$PROJECT_DIR$/js/flotr2/lib/base64.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/basic.json" afterPath="$PROJECT_DIR$/js/flotr2/make/basic.json" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/build.json" afterPath="$PROJECT_DIR$/js/flotr2/make/build.json" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/calllog.php" afterPath="$PROJECT_DIR$/calllog.php" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/calls.json.php" afterPath="$PROJECT_DIR$/calls.json.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/common.inc.php" afterPath="$PROJECT_DIR$/common.inc.php" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/examples.js" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/examples.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/examples.json" afterPath="$PROJECT_DIR$/js/flotr2/make/examples.json" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/extending-flotr.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/extending-flotr.html" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/flotr2.json" afterPath="$PROJECT_DIR$/js/flotr2/make/flotr2.json" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/js/flotr2.stable.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/js/flotr2.stable.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/lib/codemirror/lib/util/formatting.js" afterPath="$PROJECT_DIR$/js/flotr2/examples/lib/codemirror/lib/util/formatting.js" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/generateConvos.php" afterPath="$PROJECT_DIR$/generateConvos.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/getfile.php" afterPath="$PROJECT_DIR$/getfile.php" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/ie.json" afterPath="$PROJECT_DIR$/js/flotr2/make/ie.json" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/index.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/index.html" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/index.html" afterPath="$PROJECT_DIR$/js/flotr2/spec/index.html" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine-html.js" afterPath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine-html.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine.css" afterPath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine.css" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine.js" afterPath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine.js" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/vendor/jquery-1.8.0.min.js" afterPath="$PROJECT_DIR$/js/vendor/jquery-1.8.0.min.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json-data.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json-data.html" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json-real-data.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json-real-data.html" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json.txt" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json.txt" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/lib.json" afterPath="$PROJECT_DIR$/js/flotr2/make/lib.json" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/logarithmic-scale.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/logarithmic-scale.html" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/vendor/modernizr-2.6.1.min.js" afterPath="$PROJECT_DIR$/js/vendor/modernizr-2.6.1.min.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/mouse-zoom-preview.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/mouse-zoom-preview.html" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/nbproject/project.xml" afterPath="$PROJECT_DIR$/nbproject/project.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/lib/prototype.js" afterPath="$PROJECT_DIR$/js/flotr2/lib/prototype.js" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/scannr.iml" afterPath="$PROJECT_DIR$/.idea/scannr.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/scannr.py" afterPath="$PROJECT_DIR$/scannr.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/snd.py" afterPath="$PROJECT_DIR$/snd.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/style.css" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/style.css" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/js/test-background.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/js/test-background.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/js/test-boundaries.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/js/test-boundaries.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/js/test-mountain-nulls.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/js/test-mountain-nulls.js" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test.py" afterPath="$PROJECT_DIR$/test.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test2.py" afterPath="$PROJECT_DIR$/test2.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunklog.php" afterPath="$PROJECT_DIR$/trunklog.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/viewcalls.php" afterPath="$PROJECT_DIR$/viewcalls.php" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="scannr.iws" /> <ignored path=".idea/workspace.xml" /> - <file path="/Dummy.txt" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356154429152" ignored="false" /> + <file path="/Dummy.txt" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356175572544" ignored="false" /> <file path="/calllog.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356153807482" ignored="false" /> <file path="/scannr.py" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356154551131" ignored="false" /> <file path="/start_script.py" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356155203132" ignored="false" /> <file path="/a.java" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356155211924" ignored="false" /> <file path="/a.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356155216083" ignored="false" /> + <file path="/calls.json.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356155700744" ignored="false" /> <option name="TRACKING_ENABLED" value="true" /> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -76,7 +58,6 @@ <disable_hints /> </component> <component name="DebuggerManager"> - <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" /> <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true"> <breakpoint> <option name="NOTIFY_CAUGHT" value="true" /> @@ -111,6 +92,7 @@ <option name="LOG_MESSAGE" value="" /> </breakpoint> </breakpoint_any> + <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" /> <breakpoint_rules /> <ui_properties /> </component> @@ -123,16 +105,16 @@ <file leaf-file-name="calllog.php" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/calllog.php"> <provider selected="true" editor-type-id="text-editor"> - <state line="9" column="0" selection-start="189" selection-end="189" vertical-scroll-proportion="0.0"> + <state line="2" column="0" selection-start="34" selection-end="226" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="scannr.py" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/scannr.py"> + <file leaf-file-name="calls.json.php" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/calls.json.php"> <provider selected="true" editor-type-id="text-editor"> - <state line="80" column="64" selection-start="2271" selection-end="2271" vertical-scroll-proportion="-0.31178707"> + <state line="13" column="53" selection-start="499" selection-end="499" vertical-scroll-proportion="0.25930852"> <folding /> </state> </provider> @@ -158,10 +140,10 @@ <option name="changedFiles"> <list> <option value="$PROJECT_DIR$/common.inc.php" /> - <option value="$PROJECT_DIR$/calls.json.php" /> <option value="$PROJECT_DIR$/viewcalls.php" /> <option value="$PROJECT_DIR$/calllog.php" /> <option value="$PROJECT_DIR$/scannr.py" /> + <option value="$PROJECT_DIR$/calls.json.php" /> </list> </option> </component> @@ -197,7 +179,6 @@ <sortByType /> </navigator> <panes> - <pane id="PackagesPane" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -219,6 +200,7 @@ </subPane> </pane> <pane id="Scope" /> + <pane id="PackagesPane" /> </panes> </component> <component name="PropertiesComponent"> @@ -227,8 +209,8 @@ <property name="options.lastSelected" value="tasks" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../busui/myway/myway_timeliness.php" /> <property name="FullScreen" value="false" /> + <property name="options.searchVisible" value="true" /> <property name="options.splitter.details.proportions" value="0.2" /> - <property name="options.searchVisible" value="true" /> </component> <component name="PyConsoleOptionsProvider"> <option name="myPythonConsoleState"> @@ -241,6 +223,9 @@ <component name="RunManager"> <configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit"> <TestRunner /> + <method /> + </configuration> + <configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console"> <method /> </configuration> <configuration default="true" type="JavascriptDebugSession" factoryName="Local" singleton="true"> @@ -373,9 +358,7 @@ </entry> <entry file="file://$PROJECT_DIR$/scannr.py"> <provider selected="true" editor-type-id="text-editor"> - <state line="12" column="21" selection-start="328" selection-end="328" vertical-scroll-proportion="0.0"> - <folding /> - </state> + <state line="12" column="21" selection-start="328" selection-end="328" vertical-scroll-proportion="0.0" /> </provider> </entry> <entry file="file://$PROJECT_DIR$/calllog.php"> @@ -430,26 +413,26 @@ <state line="60" column="117" selection-start="2262" selection-end="2262" vertical-scroll-proportion="-39.23077" /> </provider> </entry> - <entry file="file://$PROJECT_DIR$/calls.json.php"> - <provider selected="true" editor-type-id="text-editor"> - <state line="72" column="41" selection-start="2843" selection-end="2843" vertical-scroll-proportion="-43.153847" /> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/viewcalls.php"> <provider selected="true" editor-type-id="text-editor"> <state line="41" column="69" selection-start="1388" selection-end="1388" vertical-scroll-proportion="1.2659575" /> </provider> </entry> + <entry file="file://$PROJECT_DIR$/scannr.py"> + <provider selected="true" editor-type-id="text-editor"> + <state line="80" column="64" selection-start="2271" selection-end="2271" vertical-scroll-proportion="0.0" /> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/calllog.php"> <provider selected="true" editor-type-id="text-editor"> - <state line="9" column="0" selection-start="189" selection-end="189" vertical-scroll-proportion="0.0"> + <state line="2" column="0" selection-start="34" selection-end="226" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/scannr.py"> - <provider selected="true" editor-type-id="text-editor"> - <state line="80" column="64" selection-start="2271" selection-end="2271" vertical-scroll-proportion="-0.31178707"> + <entry file="file://$PROJECT_DIR$/calls.json.php"> + <provider selected="true" editor-type-id="text-editor"> + <state line="13" column="53" selection-start="499" selection-end="499" vertical-scroll-proportion="0.25930852"> <folding /> </state> </provider>