Commit c4690ee59ffae96e7100a940bc5ef2a8bc142c5d
1 parent
5eea9060
MAJ .idea msg
Showing
4 changed files
with
336 additions
and
596 deletions
Show diff stats
.gitignore
| ... | ... | @@ -2,25 +2,25 @@ |
| 2 | 2 | ### Intellij ### |
| 3 | 3 | |
| 4 | 4 | # User-specific stuff: |
| 5 | -.idea/**/workspace.xml | |
| 6 | -.idea/**/tasks.xml | |
| 7 | -.idea/dictionaries | |
| 5 | +**/.idea/**/workspace.xml | |
| 6 | +**/.idea/**/tasks.xml | |
| 7 | +**/.idea/dictionaries | |
| 8 | 8 | |
| 9 | 9 | # Sensitive or high-churn files: |
| 10 | -.idea/**/dataSources/ | |
| 11 | -.idea/**/dataSources.ids | |
| 12 | -.idea/**/dataSources.xml | |
| 13 | -.idea/**/dataSources.local.xml | |
| 14 | -.idea/**/sqlDataSources.xml | |
| 15 | -.idea/**/dynamic.xml | |
| 16 | -.idea/**/uiDesigner.xml | |
| 10 | +**/.idea/**/dataSources/ | |
| 11 | +**/.idea/**/dataSources.ids | |
| 12 | +**/.idea/**/dataSources.xml | |
| 13 | +**/.idea/**/dataSources.local.xml | |
| 14 | +**/.idea/**/sqlDataSources.xml | |
| 15 | +**/.idea/**/dynamic.xml | |
| 16 | +**/.idea/**/uiDesigner.xml | |
| 17 | 17 | |
| 18 | 18 | # Gradle: |
| 19 | -.idea/**/gradle.xml | |
| 20 | -.idea/**/libraries | |
| 19 | +**/.idea/**/gradle.xml | |
| 20 | +**/.idea/**/libraries | |
| 21 | 21 | |
| 22 | 22 | # Mongo Explorer plugin: |
| 23 | -.idea/**/mongoSettings.xml | |
| 23 | +**/.idea/**/mongoSettings.xml | |
| 24 | 24 | |
| 25 | 25 | ## File-based project format: |
| 26 | 26 | *.iws |
| ... | ... | @@ -31,10 +31,10 @@ |
| 31 | 31 | /out/ |
| 32 | 32 | |
| 33 | 33 | # mpeltonen/sbt-idea plugin |
| 34 | -.idea_modules/ | |
| 34 | +**/.idea_modules/ | |
| 35 | 35 | |
| 36 | 36 | # Sonarlint plugin |
| 37 | -.idea/sonarlint | |
| 37 | +**/.idea/sonarlint | |
| 38 | 38 | |
| 39 | 39 | ### Java ### |
| 40 | 40 | # Compiled class file | ... | ... |
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | +<project version="4"> | |
| 3 | + <component name="ProjectModuleManager"> | |
| 4 | + <modules> | |
| 5 | + <module fileurl="file://$PROJECT_DIR$/.idea/Positionning_server.iml" filepath="$PROJECT_DIR$/.idea/Positionning_server.iml" /> | |
| 6 | + </modules> | |
| 7 | + </component> | |
| 8 | +</project> | |
| 0 | 9 | \ No newline at end of file | ... | ... |
project/.idea/workspace.xml
| ... | ... | @@ -13,26 +13,17 @@ |
| 13 | 13 | <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
| 14 | 14 | <option name="LAST_RESOLUTION" value="IGNORE" /> |
| 15 | 15 | </component> |
| 16 | + <component name="CreatePatchCommitExecutor"> | |
| 17 | + <option name="PATCH_PATH" value="" /> | |
| 18 | + </component> | |
| 16 | 19 | <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> |
| 17 | 20 | <component name="FileEditorManager"> |
| 18 | 21 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
| 19 | - <file leaf-file-name="ServerApp.java" pinned="false" current-in-tab="false"> | |
| 20 | - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/ServerApp.java"> | |
| 21 | - <provider selected="true" editor-type-id="text-editor"> | |
| 22 | - <state relative-caret-position="221"> | |
| 23 | - <caret line="15" column="25" lean-forward="false" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> | |
| 24 | - <folding> | |
| 25 | - <element signature="imports" expanded="true" /> | |
| 26 | - </folding> | |
| 27 | - </state> | |
| 28 | - </provider> | |
| 29 | - </entry> | |
| 30 | - </file> | |
| 31 | 22 | <file leaf-file-name="PositioningServlet.java" pinned="false" current-in-tab="false"> |
| 32 | 23 | <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java"> |
| 33 | 24 | <provider selected="true" editor-type-id="text-editor"> |
| 34 | - <state relative-caret-position="408"> | |
| 35 | - <caret line="28" column="0" lean-forward="false" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" /> | |
| 25 | + <state relative-caret-position="32"> | |
| 26 | + <caret line="26" column="8" lean-forward="false" selection-start-line="26" selection-start-column="8" selection-end-line="26" selection-end-column="8" /> | |
| 36 | 27 | <folding> |
| 37 | 28 | <element signature="imports" expanded="true" /> |
| 38 | 29 | </folding> |
| ... | ... | @@ -40,60 +31,34 @@ |
| 40 | 31 | </provider> |
| 41 | 32 | </entry> |
| 42 | 33 | </file> |
| 43 | - <file leaf-file-name="web.xml" pinned="false" current-in-tab="true"> | |
| 44 | - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml"> | |
| 34 | + <file leaf-file-name="PositioningService.java" pinned="false" current-in-tab="false"> | |
| 35 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java"> | |
| 45 | 36 | <provider selected="true" editor-type-id="text-editor"> |
| 46 | - <state relative-caret-position="459"> | |
| 47 | - <caret line="27" column="22" lean-forward="true" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" /> | |
| 48 | - <folding /> | |
| 49 | - </state> | |
| 50 | - </provider> | |
| 51 | - </entry> | |
| 52 | - </file> | |
| 53 | - <file leaf-file-name="HibernateDao.java" pinned="false" current-in-tab="false"> | |
| 54 | - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/dao/HibernateDao.java"> | |
| 55 | - <provider selected="true" editor-type-id="text-editor"> | |
| 56 | - <state relative-caret-position="119"> | |
| 57 | - <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" /> | |
| 37 | + <state relative-caret-position="438"> | |
| 38 | + <caret line="48" column="20" lean-forward="false" selection-start-line="48" selection-start-column="20" selection-end-line="48" selection-end-column="20" /> | |
| 58 | 39 | <folding> |
| 59 | - <element signature="method#HibernateDao#0;class#HibernateDao#0" expanded="false" /> | |
| 60 | - <element signature="method#execTransactionProcess#0;class#HibernateDao#0" expanded="false" /> | |
| 61 | - <element signature="method#internal_getData#0;class#HibernateDao#0" expanded="false" /> | |
| 62 | - <element signature="method#internal_saveData#0;class#HibernateDao#0" expanded="false" /> | |
| 63 | - <element signature="e#2375#2376#0" expanded="true" /> | |
| 64 | - <element signature="e#2420#2421#0" expanded="true" /> | |
| 65 | - <element signature="method#getTempRssi#0;class#HibernateDao#0" expanded="false" /> | |
| 66 | - <element signature="e#2614#3102#0" expanded="false" /> | |
| 67 | - <element signature="e#3208#3209#0" expanded="true" /> | |
| 68 | - <element signature="e#3255#3256#0" expanded="true" /> | |
| 69 | - <element signature="method#getRssiRecord#1;class#HibernateDao#0" expanded="false" /> | |
| 70 | - <element signature="e#4246#4247#0" expanded="true" /> | |
| 71 | - <element signature="e#4291#4292#0" expanded="true" /> | |
| 72 | - <element signature="method#getMap#0;class#HibernateDao#0" expanded="false" /> | |
| 73 | - <element signature="method#getAccessPoints#0;class#HibernateDao#0" expanded="false" /> | |
| 74 | - <element signature="method#getLocation#0;class#HibernateDao#0" expanded="false" /> | |
| 75 | - <element signature="class#ITransactionProcess#0;class#HibernateDao#0" expanded="false" /> | |
| 76 | - <element signature="class#TransactionCallBack#0;class#HibernateDao#0" expanded="false" /> | |
| 40 | + <element signature="e#3675#3676#0" expanded="true" /> | |
| 41 | + <element signature="e#3729#3730#0" expanded="true" /> | |
| 77 | 42 | </folding> |
| 78 | 43 | </state> |
| 79 | 44 | </provider> |
| 80 | 45 | </entry> |
| 81 | 46 | </file> |
| 82 | - <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false"> | |
| 83 | - <entry file="file://$PROJECT_DIR$/server_servlet/pom.xml"> | |
| 47 | + <file leaf-file-name="web.xml" pinned="false" current-in-tab="true"> | |
| 48 | + <entry file="file://$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml"> | |
| 84 | 49 | <provider selected="true" editor-type-id="text-editor"> |
| 85 | - <state relative-caret-position="68"> | |
| 86 | - <caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" /> | |
| 50 | + <state relative-caret-position="155"> | |
| 51 | + <caret line="37" column="36" lean-forward="false" selection-start-line="37" selection-start-column="36" selection-end-line="37" selection-end-column="36" /> | |
| 87 | 52 | <folding /> |
| 88 | 53 | </state> |
| 89 | 54 | </provider> |
| 90 | 55 | </entry> |
| 91 | 56 | </file> |
| 92 | - <file leaf-file-name="RssiRecord.java" pinned="false" current-in-tab="false"> | |
| 93 | - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/RssiRecord.java"> | |
| 57 | + <file leaf-file-name="APMeasurementServlet.java" pinned="false" current-in-tab="false"> | |
| 58 | + <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/APMeasurementServlet.java"> | |
| 94 | 59 | <provider selected="true" editor-type-id="text-editor"> |
| 95 | - <state relative-caret-position="493"> | |
| 96 | - <caret line="30" column="23" lean-forward="false" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" /> | |
| 60 | + <state relative-caret-position="307"> | |
| 61 | + <caret line="34" column="41" lean-forward="false" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" /> | |
| 97 | 62 | <folding> |
| 98 | 63 | <element signature="imports" expanded="true" /> |
| 99 | 64 | </folding> |
| ... | ... | @@ -103,6 +68,13 @@ |
| 103 | 68 | </file> |
| 104 | 69 | </leaf> |
| 105 | 70 | </component> |
| 71 | + <component name="FileTemplateManagerImpl"> | |
| 72 | + <option name="RECENT_TEMPLATES"> | |
| 73 | + <list> | |
| 74 | + <option value="Class" /> | |
| 75 | + </list> | |
| 76 | + </option> | |
| 77 | + </component> | |
| 106 | 78 | <component name="GradleLocalSettings"> |
| 107 | 79 | <option name="externalProjectsViewState"> |
| 108 | 80 | <projects_view /> |
| ... | ... | @@ -110,422 +82,66 @@ |
| 110 | 82 | </component> |
| 111 | 83 | <component name="IdeDocumentHistory"> |
| 112 | 84 | <option name="CHANGED_PATHS"> |
| 113 | - <list> | |
| 114 | - <option value="$PROJECT_DIR$/server_core/pom.xml" /> | |
| 115 | - <option value="$PROJECT_DIR$/pom.xml" /> | |
| 116 | - <option value="$PROJECT_DIR$/server_servlet/pom.xml" /> | |
| 117 | - <option value="$PROJECT_DIR$/server_core/src/main/java/service/ConnectionService.java" /> | |
| 118 | - <option value="$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java" /> | |
| 119 | - <option value="$PROJECT_DIR$/server_core/src/main/java/utils/HibernateUtil.java" /> | |
| 120 | - <option value="$PROJECT_DIR$/server_core/src/main/java/repository/Mape.java" /> | |
| 121 | - <option value="$PROJECT_DIR$/server_core/src/main/resources/hibernate.cfg.xml" /> | |
| 122 | - <option value="$PROJECT_DIR$/server_core/src/main/java/repository/Location.java" /> | |
| 123 | - <option value="$PROJECT_DIR$/server_core/src/main/java/repository/AccessPoint.java" /> | |
| 124 | - <option value="$PROJECT_DIR$/server_core/src/main/java/repository/TempRssi.java" /> | |
| 125 | - <option value="$PROJECT_DIR$/server_core/src/main/java/repository/RssiRecord.java" /> | |
| 126 | - <option value="$PROJECT_DIR$/server_core/src/main/java/repository/Map.java" /> | |
| 127 | - <option value="$PROJECT_DIR$/server_core/src/main/java/ServerApp.java" /> | |
| 128 | - <option value="$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java" /> | |
| 129 | - <option value="$PROJECT_DIR$/server_core/src/main/java/service/CalibrationService.java" /> | |
| 130 | - <option value="$PROJECT_DIR$/server_core/src/main/java/dao/HibernateDao.java" /> | |
| 131 | - <option value="$PROJECT_DIR$/server_servlet/src/main/java/CalibrationServlet.java" /> | |
| 132 | - <option value="$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml" /> | |
| 133 | - </list> | |
| 134 | - </option> | |
| 135 | - </component> | |
| 136 | - <component name="MavenImportPreferences"> | |
| 137 | - <option name="importingSettings"> | |
| 138 | - <MavenImportingSettings> | |
| 139 | - <option name="importAutomatically" value="true" /> | |
| 140 | - </MavenImportingSettings> | |
| 141 | - </option> | |
| 142 | - </component> | |
| 143 | - <component name="ProjectFrameBounds"> | |
| 144 | - <option name="x" value="-8" /> | |
| 145 | - <option name="y" value="-8" /> | |
| 146 | - <option name="width" value="1936" /> | |
| 147 | - <option name="height" value="1056" /> | |
| 148 | - </component> | |
| 149 | - <component name="ProjectView"> | |
| 150 | - <navigator currentView="ProjectPane" proportions="" version="1"> | |
| 151 | - <flattenPackages /> | |
| 152 | - <showMembers /> | |
| 153 | - <showModules /> | |
| 154 | - <showLibraryContents /> | |
| 155 | - <hideEmptyPackages /> | |
| 156 | - <abbreviatePackageNames /> | |
| 157 | - <autoscrollToSource /> | |
| 158 | - <autoscrollFromSource /> | |
| 159 | - <sortByType /> | |
| 160 | - <manualOrder /> | |
| 161 | - <foldersAlwaysOnTop value="true" /> | |
| 162 | - </navigator> | |
| 163 | - <panes> | |
| 164 | - <pane id="Scratches" /> | |
| 165 | - <pane id="Scope" /> | |
| 166 | - <pane id="PackagesPane" /> | |
| 167 | - <pane id="ProjectPane"> | |
| 168 | - <subPane> | |
| 169 | - <PATH> | |
| 170 | - <PATH_ELEMENT> | |
| 171 | - <option name="myItemId" value="project" /> | |
| 172 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 173 | - </PATH_ELEMENT> | |
| 174 | - <PATH_ELEMENT> | |
| 175 | - <option name="myItemId" value="project" /> | |
| 176 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 177 | - </PATH_ELEMENT> | |
| 178 | - </PATH> | |
| 179 | - <PATH> | |
| 180 | - <PATH_ELEMENT> | |
| 181 | - <option name="myItemId" value="project" /> | |
| 182 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 183 | - </PATH_ELEMENT> | |
| 184 | - <PATH_ELEMENT> | |
| 185 | - <option name="myItemId" value="project" /> | |
| 186 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 187 | - </PATH_ELEMENT> | |
| 188 | - <PATH_ELEMENT> | |
| 189 | - <option name="myItemId" value="server_servlet" /> | |
| 190 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 191 | - </PATH_ELEMENT> | |
| 192 | - </PATH> | |
| 193 | - <PATH> | |
| 194 | - <PATH_ELEMENT> | |
| 195 | - <option name="myItemId" value="project" /> | |
| 196 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 197 | - </PATH_ELEMENT> | |
| 198 | - <PATH_ELEMENT> | |
| 199 | - <option name="myItemId" value="project" /> | |
| 200 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 201 | - </PATH_ELEMENT> | |
| 202 | - <PATH_ELEMENT> | |
| 203 | - <option name="myItemId" value="server_servlet" /> | |
| 204 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 205 | - </PATH_ELEMENT> | |
| 206 | - <PATH_ELEMENT> | |
| 207 | - <option name="myItemId" value="target" /> | |
| 208 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 209 | - </PATH_ELEMENT> | |
| 210 | - <PATH_ELEMENT> | |
| 211 | - <option name="myItemId" value="generated-sources" /> | |
| 212 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 213 | - </PATH_ELEMENT> | |
| 214 | - </PATH> | |
| 215 | - <PATH> | |
| 216 | - <PATH_ELEMENT> | |
| 217 | - <option name="myItemId" value="project" /> | |
| 218 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 219 | - </PATH_ELEMENT> | |
| 220 | - <PATH_ELEMENT> | |
| 221 | - <option name="myItemId" value="project" /> | |
| 222 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 223 | - </PATH_ELEMENT> | |
| 224 | - <PATH_ELEMENT> | |
| 225 | - <option name="myItemId" value="server_servlet" /> | |
| 226 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 227 | - </PATH_ELEMENT> | |
| 228 | - <PATH_ELEMENT> | |
| 229 | - <option name="myItemId" value="target" /> | |
| 230 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 231 | - </PATH_ELEMENT> | |
| 232 | - <PATH_ELEMENT> | |
| 233 | - <option name="myItemId" value="classes" /> | |
| 234 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 235 | - </PATH_ELEMENT> | |
| 236 | - </PATH> | |
| 237 | - <PATH> | |
| 238 | - <PATH_ELEMENT> | |
| 239 | - <option name="myItemId" value="project" /> | |
| 240 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 241 | - </PATH_ELEMENT> | |
| 242 | - <PATH_ELEMENT> | |
| 243 | - <option name="myItemId" value="project" /> | |
| 244 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 245 | - </PATH_ELEMENT> | |
| 246 | - <PATH_ELEMENT> | |
| 247 | - <option name="myItemId" value="server_servlet" /> | |
| 248 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 249 | - </PATH_ELEMENT> | |
| 250 | - <PATH_ELEMENT> | |
| 251 | - <option name="myItemId" value="src" /> | |
| 252 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 253 | - </PATH_ELEMENT> | |
| 254 | - </PATH> | |
| 255 | - <PATH> | |
| 256 | - <PATH_ELEMENT> | |
| 257 | - <option name="myItemId" value="project" /> | |
| 258 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 259 | - </PATH_ELEMENT> | |
| 260 | - <PATH_ELEMENT> | |
| 261 | - <option name="myItemId" value="project" /> | |
| 262 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 263 | - </PATH_ELEMENT> | |
| 264 | - <PATH_ELEMENT> | |
| 265 | - <option name="myItemId" value="server_servlet" /> | |
| 266 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 267 | - </PATH_ELEMENT> | |
| 268 | - <PATH_ELEMENT> | |
| 269 | - <option name="myItemId" value="src" /> | |
| 270 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 271 | - </PATH_ELEMENT> | |
| 272 | - <PATH_ELEMENT> | |
| 273 | - <option name="myItemId" value="main" /> | |
| 274 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 275 | - </PATH_ELEMENT> | |
| 276 | - <PATH_ELEMENT> | |
| 277 | - <option name="myItemId" value="webapp" /> | |
| 278 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 279 | - </PATH_ELEMENT> | |
| 280 | - <PATH_ELEMENT> | |
| 281 | - <option name="myItemId" value="WEB-INF" /> | |
| 282 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 283 | - </PATH_ELEMENT> | |
| 284 | - </PATH> | |
| 285 | - <PATH> | |
| 286 | - <PATH_ELEMENT> | |
| 287 | - <option name="myItemId" value="project" /> | |
| 288 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 289 | - </PATH_ELEMENT> | |
| 290 | - <PATH_ELEMENT> | |
| 291 | - <option name="myItemId" value="project" /> | |
| 292 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 293 | - </PATH_ELEMENT> | |
| 294 | - <PATH_ELEMENT> | |
| 295 | - <option name="myItemId" value="server_servlet" /> | |
| 296 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 297 | - </PATH_ELEMENT> | |
| 298 | - <PATH_ELEMENT> | |
| 299 | - <option name="myItemId" value="src" /> | |
| 300 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 301 | - </PATH_ELEMENT> | |
| 302 | - <PATH_ELEMENT> | |
| 303 | - <option name="myItemId" value="main" /> | |
| 304 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 305 | - </PATH_ELEMENT> | |
| 306 | - <PATH_ELEMENT> | |
| 307 | - <option name="myItemId" value="webapp" /> | |
| 308 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 309 | - </PATH_ELEMENT> | |
| 310 | - </PATH> | |
| 311 | - <PATH> | |
| 312 | - <PATH_ELEMENT> | |
| 313 | - <option name="myItemId" value="project" /> | |
| 314 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 315 | - </PATH_ELEMENT> | |
| 316 | - <PATH_ELEMENT> | |
| 317 | - <option name="myItemId" value="project" /> | |
| 318 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 319 | - </PATH_ELEMENT> | |
| 320 | - <PATH_ELEMENT> | |
| 321 | - <option name="myItemId" value="server_servlet" /> | |
| 322 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 323 | - </PATH_ELEMENT> | |
| 324 | - <PATH_ELEMENT> | |
| 325 | - <option name="myItemId" value="src" /> | |
| 326 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 327 | - </PATH_ELEMENT> | |
| 328 | - <PATH_ELEMENT> | |
| 329 | - <option name="myItemId" value="main" /> | |
| 330 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 331 | - </PATH_ELEMENT> | |
| 332 | - </PATH> | |
| 333 | - <PATH> | |
| 334 | - <PATH_ELEMENT> | |
| 335 | - <option name="myItemId" value="project" /> | |
| 336 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 337 | - </PATH_ELEMENT> | |
| 338 | - <PATH_ELEMENT> | |
| 339 | - <option name="myItemId" value="project" /> | |
| 340 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 341 | - </PATH_ELEMENT> | |
| 342 | - <PATH_ELEMENT> | |
| 343 | - <option name="myItemId" value="server_servlet" /> | |
| 344 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 345 | - </PATH_ELEMENT> | |
| 346 | - <PATH_ELEMENT> | |
| 347 | - <option name="myItemId" value="src" /> | |
| 348 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 349 | - </PATH_ELEMENT> | |
| 350 | - <PATH_ELEMENT> | |
| 351 | - <option name="myItemId" value="main" /> | |
| 352 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 353 | - </PATH_ELEMENT> | |
| 354 | - <PATH_ELEMENT> | |
| 355 | - <option name="myItemId" value="java" /> | |
| 356 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 357 | - </PATH_ELEMENT> | |
| 358 | - </PATH> | |
| 359 | - <PATH> | |
| 360 | - <PATH_ELEMENT> | |
| 361 | - <option name="myItemId" value="project" /> | |
| 362 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 363 | - </PATH_ELEMENT> | |
| 364 | - <PATH_ELEMENT> | |
| 365 | - <option name="myItemId" value="project" /> | |
| 366 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 367 | - </PATH_ELEMENT> | |
| 368 | - <PATH_ELEMENT> | |
| 369 | - <option name="myItemId" value="server_core" /> | |
| 370 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 371 | - </PATH_ELEMENT> | |
| 372 | - </PATH> | |
| 373 | - <PATH> | |
| 374 | - <PATH_ELEMENT> | |
| 375 | - <option name="myItemId" value="project" /> | |
| 376 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 377 | - </PATH_ELEMENT> | |
| 378 | - <PATH_ELEMENT> | |
| 379 | - <option name="myItemId" value="project" /> | |
| 380 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 381 | - </PATH_ELEMENT> | |
| 382 | - <PATH_ELEMENT> | |
| 383 | - <option name="myItemId" value="server_core" /> | |
| 384 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 385 | - </PATH_ELEMENT> | |
| 386 | - <PATH_ELEMENT> | |
| 387 | - <option name="myItemId" value="src" /> | |
| 388 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 389 | - </PATH_ELEMENT> | |
| 390 | - </PATH> | |
| 391 | - <PATH> | |
| 392 | - <PATH_ELEMENT> | |
| 393 | - <option name="myItemId" value="project" /> | |
| 394 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 395 | - </PATH_ELEMENT> | |
| 396 | - <PATH_ELEMENT> | |
| 397 | - <option name="myItemId" value="project" /> | |
| 398 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 399 | - </PATH_ELEMENT> | |
| 400 | - <PATH_ELEMENT> | |
| 401 | - <option name="myItemId" value="server_core" /> | |
| 402 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 403 | - </PATH_ELEMENT> | |
| 404 | - <PATH_ELEMENT> | |
| 405 | - <option name="myItemId" value="src" /> | |
| 406 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 407 | - </PATH_ELEMENT> | |
| 408 | - <PATH_ELEMENT> | |
| 409 | - <option name="myItemId" value="main" /> | |
| 410 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 411 | - </PATH_ELEMENT> | |
| 412 | - </PATH> | |
| 413 | - <PATH> | |
| 414 | - <PATH_ELEMENT> | |
| 415 | - <option name="myItemId" value="project" /> | |
| 416 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 417 | - </PATH_ELEMENT> | |
| 418 | - <PATH_ELEMENT> | |
| 419 | - <option name="myItemId" value="project" /> | |
| 420 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 421 | - </PATH_ELEMENT> | |
| 422 | - <PATH_ELEMENT> | |
| 423 | - <option name="myItemId" value="server_core" /> | |
| 424 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 425 | - </PATH_ELEMENT> | |
| 426 | - <PATH_ELEMENT> | |
| 427 | - <option name="myItemId" value="src" /> | |
| 428 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 429 | - </PATH_ELEMENT> | |
| 430 | - <PATH_ELEMENT> | |
| 431 | - <option name="myItemId" value="main" /> | |
| 432 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 433 | - </PATH_ELEMENT> | |
| 434 | - <PATH_ELEMENT> | |
| 435 | - <option name="myItemId" value="java" /> | |
| 436 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 437 | - </PATH_ELEMENT> | |
| 438 | - </PATH> | |
| 439 | - <PATH> | |
| 440 | - <PATH_ELEMENT> | |
| 441 | - <option name="myItemId" value="project" /> | |
| 442 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 443 | - </PATH_ELEMENT> | |
| 444 | - <PATH_ELEMENT> | |
| 445 | - <option name="myItemId" value="project" /> | |
| 446 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 447 | - </PATH_ELEMENT> | |
| 448 | - <PATH_ELEMENT> | |
| 449 | - <option name="myItemId" value="server_core" /> | |
| 450 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 451 | - </PATH_ELEMENT> | |
| 452 | - <PATH_ELEMENT> | |
| 453 | - <option name="myItemId" value="src" /> | |
| 454 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 455 | - </PATH_ELEMENT> | |
| 456 | - <PATH_ELEMENT> | |
| 457 | - <option name="myItemId" value="main" /> | |
| 458 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 459 | - </PATH_ELEMENT> | |
| 460 | - <PATH_ELEMENT> | |
| 461 | - <option name="myItemId" value="java" /> | |
| 462 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 463 | - </PATH_ELEMENT> | |
| 464 | - <PATH_ELEMENT> | |
| 465 | - <option name="myItemId" value="utils" /> | |
| 466 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 467 | - </PATH_ELEMENT> | |
| 468 | - </PATH> | |
| 469 | - <PATH> | |
| 470 | - <PATH_ELEMENT> | |
| 471 | - <option name="myItemId" value="project" /> | |
| 472 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 473 | - </PATH_ELEMENT> | |
| 474 | - <PATH_ELEMENT> | |
| 475 | - <option name="myItemId" value="project" /> | |
| 476 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 477 | - </PATH_ELEMENT> | |
| 478 | - <PATH_ELEMENT> | |
| 479 | - <option name="myItemId" value="server_core" /> | |
| 480 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 481 | - </PATH_ELEMENT> | |
| 482 | - <PATH_ELEMENT> | |
| 483 | - <option name="myItemId" value="src" /> | |
| 484 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 485 | - </PATH_ELEMENT> | |
| 486 | - <PATH_ELEMENT> | |
| 487 | - <option name="myItemId" value="main" /> | |
| 488 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 489 | - </PATH_ELEMENT> | |
| 490 | - <PATH_ELEMENT> | |
| 491 | - <option name="myItemId" value="java" /> | |
| 492 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 493 | - </PATH_ELEMENT> | |
| 494 | - <PATH_ELEMENT> | |
| 495 | - <option name="myItemId" value="service" /> | |
| 496 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 497 | - </PATH_ELEMENT> | |
| 498 | - </PATH> | |
| 499 | - <PATH> | |
| 500 | - <PATH_ELEMENT> | |
| 501 | - <option name="myItemId" value="project" /> | |
| 502 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
| 503 | - </PATH_ELEMENT> | |
| 504 | - <PATH_ELEMENT> | |
| 505 | - <option name="myItemId" value="project" /> | |
| 506 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 507 | - </PATH_ELEMENT> | |
| 508 | - <PATH_ELEMENT> | |
| 509 | - <option name="myItemId" value="server_core" /> | |
| 510 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 511 | - </PATH_ELEMENT> | |
| 512 | - <PATH_ELEMENT> | |
| 513 | - <option name="myItemId" value="src" /> | |
| 514 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 515 | - </PATH_ELEMENT> | |
| 516 | - <PATH_ELEMENT> | |
| 517 | - <option name="myItemId" value="main" /> | |
| 518 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 519 | - </PATH_ELEMENT> | |
| 520 | - <PATH_ELEMENT> | |
| 521 | - <option name="myItemId" value="java" /> | |
| 522 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 523 | - </PATH_ELEMENT> | |
| 524 | - <PATH_ELEMENT> | |
| 525 | - <option name="myItemId" value="repository" /> | |
| 526 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 527 | - </PATH_ELEMENT> | |
| 528 | - </PATH> | |
| 85 | + <list> | |
| 86 | + <option value="$PROJECT_DIR$/server_core/pom.xml" /> | |
| 87 | + <option value="$PROJECT_DIR$/pom.xml" /> | |
| 88 | + <option value="$PROJECT_DIR$/server_servlet/pom.xml" /> | |
| 89 | + <option value="$PROJECT_DIR$/server_core/src/main/java/service/ConnectionService.java" /> | |
| 90 | + <option value="$PROJECT_DIR$/server_core/src/main/java/utils/HibernateUtil.java" /> | |
| 91 | + <option value="$PROJECT_DIR$/server_core/src/main/java/repository/Mape.java" /> | |
| 92 | + <option value="$PROJECT_DIR$/server_core/src/main/resources/hibernate.cfg.xml" /> | |
| 93 | + <option value="$PROJECT_DIR$/server_core/src/main/java/repository/Location.java" /> | |
| 94 | + <option value="$PROJECT_DIR$/server_core/src/main/java/repository/AccessPoint.java" /> | |
| 95 | + <option value="$PROJECT_DIR$/server_core/src/main/java/repository/RssiRecord.java" /> | |
| 96 | + <option value="$PROJECT_DIR$/server_core/src/main/java/ServerApp.java" /> | |
| 97 | + <option value="$PROJECT_DIR$/server_core/src/main/java/service/CalibrationService.java" /> | |
| 98 | + <option value="$PROJECT_DIR$/server_servlet/src/main/java/CalibrationServlet.java" /> | |
| 99 | + <option value="$PROJECT_DIR$/server_core/src/main/java/dao/DebianDao.java" /> | |
| 100 | + <option value="$PROJECT_DIR$/server_core/src/main/java/service/MapService.java" /> | |
| 101 | + <option value="$PROJECT_DIR$/server_core/src/main/java/repository/Map.java" /> | |
| 102 | + <option value="$PROJECT_DIR$/server_servlet/src/main/java/MapServlet.java" /> | |
| 103 | + <option value="$PROJECT_DIR$/server_servlet/src/main/java/MapByteServlet.java" /> | |
| 104 | + <option value="$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java" /> | |
| 105 | + <option value="$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml" /> | |
| 106 | + <option value="$PROJECT_DIR$/server_core/src/main/java/service/MeasurementService.java" /> | |
| 107 | + <option value="$PROJECT_DIR$/server_core/src/main/java/repository/TempRssi.java" /> | |
| 108 | + <option value="$PROJECT_DIR$/server_core/src/main/java/dao/HibernateDao.java" /> | |
| 109 | + <option value="$PROJECT_DIR$/server_servlet/src/main/java/APMeasurementServlet.java" /> | |
| 110 | + <option value="$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java" /> | |
| 111 | + </list> | |
| 112 | + </option> | |
| 113 | + </component> | |
| 114 | + <component name="MavenImportPreferences"> | |
| 115 | + <option name="importingSettings"> | |
| 116 | + <MavenImportingSettings> | |
| 117 | + <option name="importAutomatically" value="true" /> | |
| 118 | + </MavenImportingSettings> | |
| 119 | + </option> | |
| 120 | + </component> | |
| 121 | + <component name="ProjectFrameBounds"> | |
| 122 | + <option name="x" value="54" /> | |
| 123 | + <option name="y" value="-8" /> | |
| 124 | + <option name="width" value="1320" /> | |
| 125 | + <option name="height" value="784" /> | |
| 126 | + </component> | |
| 127 | + <component name="ProjectView"> | |
| 128 | + <navigator currentView="ProjectPane" proportions="" version="1"> | |
| 129 | + <flattenPackages /> | |
| 130 | + <showMembers /> | |
| 131 | + <showModules /> | |
| 132 | + <showLibraryContents /> | |
| 133 | + <hideEmptyPackages /> | |
| 134 | + <abbreviatePackageNames /> | |
| 135 | + <autoscrollToSource /> | |
| 136 | + <autoscrollFromSource /> | |
| 137 | + <sortByType /> | |
| 138 | + <manualOrder /> | |
| 139 | + <foldersAlwaysOnTop value="true" /> | |
| 140 | + </navigator> | |
| 141 | + <panes> | |
| 142 | + <pane id="PackagesPane" /> | |
| 143 | + <pane id="ProjectPane"> | |
| 144 | + <subPane> | |
| 529 | 145 | <PATH> |
| 530 | 146 | <PATH_ELEMENT> |
| 531 | 147 | <option name="myItemId" value="project" /> |
| ... | ... | @@ -535,36 +151,18 @@ |
| 535 | 151 | <option name="myItemId" value="project" /> |
| 536 | 152 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 537 | 153 | </PATH_ELEMENT> |
| 538 | - <PATH_ELEMENT> | |
| 539 | - <option name="myItemId" value="server_core" /> | |
| 540 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 541 | - </PATH_ELEMENT> | |
| 542 | - <PATH_ELEMENT> | |
| 543 | - <option name="myItemId" value="src" /> | |
| 544 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 545 | - </PATH_ELEMENT> | |
| 546 | - <PATH_ELEMENT> | |
| 547 | - <option name="myItemId" value="main" /> | |
| 548 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 549 | - </PATH_ELEMENT> | |
| 550 | - <PATH_ELEMENT> | |
| 551 | - <option name="myItemId" value="java" /> | |
| 552 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 553 | - </PATH_ELEMENT> | |
| 554 | - <PATH_ELEMENT> | |
| 555 | - <option name="myItemId" value="dao" /> | |
| 556 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
| 557 | - </PATH_ELEMENT> | |
| 558 | 154 | </PATH> |
| 559 | 155 | </subPane> |
| 560 | 156 | </pane> |
| 157 | + <pane id="Scratches" /> | |
| 158 | + <pane id="Scope" /> | |
| 561 | 159 | </panes> |
| 562 | 160 | </component> |
| 563 | 161 | <component name="PropertiesComponent"> |
| 564 | 162 | <property name="project.structure.last.edited" value="Artifacts" /> |
| 565 | 163 | <property name="project.structure.proportion" value="0.15" /> |
| 566 | 164 | <property name="project.structure.side.proportion" value="0.2" /> |
| 567 | - <property name="last_opened_file_path" value="$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF" /> | |
| 165 | + <property name="last_opened_file_path" value="$PROJECT_DIR$" /> | |
| 568 | 166 | </component> |
| 569 | 167 | <component name="RunDashboard"> |
| 570 | 168 | <option name="ruleStates"> |
| ... | ... | @@ -798,19 +396,6 @@ |
| 798 | 396 | <listeners /> |
| 799 | 397 | <method /> |
| 800 | 398 | </configuration> |
| 801 | - <configuration default="true" type="executeSpecs" factoryName="Gauge Execution"> | |
| 802 | - <setting name="environment" value="" /> | |
| 803 | - <setting name="specsToExecute" value="" /> | |
| 804 | - <setting name="tags" value="" /> | |
| 805 | - <setting name="parallelNodes" value="" /> | |
| 806 | - <setting name="execInParallel" value="false" /> | |
| 807 | - <setting name="programParameters" value="" /> | |
| 808 | - <setting name="workingDirectory" value="" /> | |
| 809 | - <setting name="moduleName" value="" /> | |
| 810 | - <envMap /> | |
| 811 | - <setting name="rowsRange" value="" /> | |
| 812 | - <method /> | |
| 813 | - </configuration> | |
| 814 | 399 | <list size="1"> |
| 815 | 400 | <item index="0" class="java.lang.String" itemvalue="Application.ServerApp" /> |
| 816 | 401 | </list> |
| ... | ... | @@ -833,36 +418,53 @@ |
| 833 | 418 | </task> |
| 834 | 419 | <servers /> |
| 835 | 420 | </component> |
| 421 | + <component name="TodoView"> | |
| 422 | + <todo-panel id="selected-file"> | |
| 423 | + <is-autoscroll-to-source value="true" /> | |
| 424 | + </todo-panel> | |
| 425 | + <todo-panel id="all"> | |
| 426 | + <are-packages-shown value="true" /> | |
| 427 | + <is-autoscroll-to-source value="true" /> | |
| 428 | + </todo-panel> | |
| 429 | + </component> | |
| 836 | 430 | <component name="ToolWindowManager"> |
| 837 | - <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> | |
| 838 | - <editor active="true" /> | |
| 431 | + <frame x="54" y="-8" width="1320" height="784" extended-state="6" /> | |
| 432 | + <editor active="false" /> | |
| 839 | 433 | <layout> |
| 840 | - <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" /> | |
| 434 | + <window_info id="Palette" 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" /> | |
| 435 | + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18222222" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> | |
| 841 | 436 | <window_info id="Nl-Palette" 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" /> |
| 437 | + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.05185185" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | |
| 842 | 438 | <window_info id="Palette	" 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" /> |
| 843 | 439 | <window_info id="Image Layers" 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" /> |
| 844 | 440 | <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" /> |
| 845 | 441 | <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" /> |
| 846 | 442 | <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" /> |
| 847 | - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | |
| 848 | 443 | <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39809927" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
| 444 | + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | |
| 849 | 445 | <window_info id="Properties" 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" /> |
| 850 | 446 | <window_info id="Terminal" 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" /> |
| 851 | 447 | <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" /> |
| 852 | 448 | <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" /> |
| 853 | - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18854167" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | |
| 449 | + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33358896" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | |
| 450 | + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32946146" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | |
| 854 | 451 | <window_info id="Structure" active="false" anchor="left" 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" /> |
| 855 | 452 | <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" /> |
| 453 | + <window_info id="UI 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="7" side_tool="false" content_ui="tabs" /> | |
| 856 | 454 | <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" /> |
| 857 | - <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" /> | |
| 858 | 455 | <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> |
| 456 | + <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" /> | |
| 859 | 457 | <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" /> |
| 860 | 458 | <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" /> |
| 459 | + <window_info id="IDEtalk" 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="4" side_tool="false" content_ui="tabs" /> | |
| 861 | 460 | <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
| 461 | + <window_info id="Application Servers" 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="8" side_tool="false" content_ui="tabs" /> | |
| 862 | 462 | <window_info id="Hierarchy" 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="2" side_tool="false" content_ui="combo" /> |
| 863 | - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32946146" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | |
| 463 | + <window_info id="Statistic" 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="14" side_tool="false" content_ui="tabs" /> | |
| 464 | + <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="9" side_tool="false" content_ui="tabs" /> | |
| 465 | + <window_info id="Changes" 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="9" side_tool="false" content_ui="tabs" /> | |
| 864 | 466 | <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> |
| 865 | - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32946146" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | |
| 467 | + <window_info id="IDEtalk Messages" 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="13" side_tool="false" content_ui="tabs" /> | |
| 866 | 468 | </layout> |
| 867 | 469 | </component> |
| 868 | 470 | <component name="VcsContentAnnotationSettings"> |
| ... | ... | @@ -881,6 +483,70 @@ |
| 881 | 483 | <component name="editorHistoryManager"> |
| 882 | 484 | <entry file="file://$PROJECT_DIR$/server_core/src/main/java/ServerApp.java"> |
| 883 | 485 | <provider selected="true" editor-type-id="text-editor"> |
| 486 | + <state relative-caret-position="208"> | |
| 487 | + <caret line="15" column="25" lean-forward="false" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> | |
| 488 | + <folding> | |
| 489 | + <element signature="imports" expanded="true" /> | |
| 490 | + </folding> | |
| 491 | + </state> | |
| 492 | + </provider> | |
| 493 | + </entry> | |
| 494 | + <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java"> | |
| 495 | + <provider selected="true" editor-type-id="text-editor"> | |
| 496 | + <state relative-caret-position="384"> | |
| 497 | + <caret line="28" column="0" lean-forward="false" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" /> | |
| 498 | + <folding> | |
| 499 | + <element signature="imports" expanded="true" /> | |
| 500 | + </folding> | |
| 501 | + </state> | |
| 502 | + </provider> | |
| 503 | + </entry> | |
| 504 | + <entry file="file://$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml"> | |
| 505 | + <provider selected="true" editor-type-id="text-editor"> | |
| 506 | + <state relative-caret-position="0"> | |
| 507 | + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | |
| 508 | + <folding /> | |
| 509 | + </state> | |
| 510 | + </provider> | |
| 511 | + </entry> | |
| 512 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/dao/HibernateDao.java"> | |
| 513 | + <provider selected="true" editor-type-id="text-editor"> | |
| 514 | + <state relative-caret-position="112"> | |
| 515 | + <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" /> | |
| 516 | + <folding> | |
| 517 | + <element signature="method#HibernateDao#0;class#HibernateDao#0" expanded="false" /> | |
| 518 | + <element signature="method#execTransactionProcess#0;class#HibernateDao#0" expanded="false" /> | |
| 519 | + <element signature="method#internal_getData#0;class#HibernateDao#0" expanded="false" /> | |
| 520 | + <element signature="method#internal_saveData#0;class#HibernateDao#0" expanded="false" /> | |
| 521 | + <element signature="method#getTempRssi#0;class#HibernateDao#0" expanded="false" /> | |
| 522 | + <element signature="method#getRssiRecord#1;class#HibernateDao#0" expanded="false" /> | |
| 523 | + <element signature="method#getMap#0;class#HibernateDao#0" expanded="false" /> | |
| 524 | + <element signature="method#getAccessPoints#0;class#HibernateDao#0" expanded="false" /> | |
| 525 | + <element signature="method#getLocation#0;class#HibernateDao#0" expanded="false" /> | |
| 526 | + </folding> | |
| 527 | + </state> | |
| 528 | + </provider> | |
| 529 | + </entry> | |
| 530 | + <entry file="file://$PROJECT_DIR$/server_servlet/pom.xml"> | |
| 531 | + <provider selected="true" editor-type-id="text-editor"> | |
| 532 | + <state relative-caret-position="64"> | |
| 533 | + <caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" /> | |
| 534 | + <folding /> | |
| 535 | + </state> | |
| 536 | + </provider> | |
| 537 | + </entry> | |
| 538 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/RssiRecord.java"> | |
| 539 | + <provider selected="true" editor-type-id="text-editor"> | |
| 540 | + <state relative-caret-position="464"> | |
| 541 | + <caret line="30" column="23" lean-forward="false" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" /> | |
| 542 | + <folding> | |
| 543 | + <element signature="imports" expanded="false" /> | |
| 544 | + </folding> | |
| 545 | + </state> | |
| 546 | + </provider> | |
| 547 | + </entry> | |
| 548 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/ServerApp.java"> | |
| 549 | + <provider selected="true" editor-type-id="text-editor"> | |
| 884 | 550 | <state relative-caret-position="221"> |
| 885 | 551 | <caret line="15" column="25" lean-forward="false" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> |
| 886 | 552 | <folding> |
| ... | ... | @@ -908,20 +574,11 @@ |
| 908 | 574 | <element signature="method#execTransactionProcess#0;class#HibernateDao#0" expanded="false" /> |
| 909 | 575 | <element signature="method#internal_getData#0;class#HibernateDao#0" expanded="false" /> |
| 910 | 576 | <element signature="method#internal_saveData#0;class#HibernateDao#0" expanded="false" /> |
| 911 | - <element signature="e#2375#2376#0" expanded="true" /> | |
| 912 | - <element signature="e#2420#2421#0" expanded="true" /> | |
| 913 | 577 | <element signature="method#getTempRssi#0;class#HibernateDao#0" expanded="false" /> |
| 914 | - <element signature="e#2614#3102#0" expanded="false" /> | |
| 915 | - <element signature="e#3208#3209#0" expanded="true" /> | |
| 916 | - <element signature="e#3255#3256#0" expanded="true" /> | |
| 917 | 578 | <element signature="method#getRssiRecord#1;class#HibernateDao#0" expanded="false" /> |
| 918 | - <element signature="e#4246#4247#0" expanded="true" /> | |
| 919 | - <element signature="e#4291#4292#0" expanded="true" /> | |
| 920 | 579 | <element signature="method#getMap#0;class#HibernateDao#0" expanded="false" /> |
| 921 | 580 | <element signature="method#getAccessPoints#0;class#HibernateDao#0" expanded="false" /> |
| 922 | 581 | <element signature="method#getLocation#0;class#HibernateDao#0" expanded="false" /> |
| 923 | - <element signature="class#ITransactionProcess#0;class#HibernateDao#0" expanded="false" /> | |
| 924 | - <element signature="class#TransactionCallBack#0;class#HibernateDao#0" expanded="false" /> | |
| 925 | 582 | </folding> |
| 926 | 583 | </state> |
| 927 | 584 | </provider> |
| ... | ... | @@ -939,7 +596,7 @@ |
| 939 | 596 | <state relative-caret-position="493"> |
| 940 | 597 | <caret line="30" column="23" lean-forward="false" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" /> |
| 941 | 598 | <folding> |
| 942 | - <element signature="imports" expanded="true" /> | |
| 599 | + <element signature="imports" expanded="false" /> | |
| 943 | 600 | </folding> |
| 944 | 601 | </state> |
| 945 | 602 | </provider> |
| ... | ... | @@ -985,120 +642,173 @@ |
| 985 | 642 | </state> |
| 986 | 643 | </provider> |
| 987 | 644 | </entry> |
| 988 | - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/dao/DebianDao.java"> | |
| 989 | - <provider selected="true" editor-type-id="text-editor"> | |
| 990 | - <state relative-caret-position="85"> | |
| 991 | - <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> | |
| 992 | - </state> | |
| 993 | - </provider> | |
| 994 | - </entry> | |
| 995 | - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/ConnectionService.java"> | |
| 645 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/resources/hibernate.cfg.xml"> | |
| 996 | 646 | <provider selected="true" editor-type-id="text-editor"> |
| 997 | - <state relative-caret-position="0"> | |
| 998 | - <caret line="0" column="8" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" /> | |
| 647 | + <state relative-caret-position="340"> | |
| 648 | + <caret line="20" column="26" lean-forward="true" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" /> | |
| 999 | 649 | </state> |
| 1000 | 650 | </provider> |
| 1001 | 651 | </entry> |
| 1002 | - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java"> | |
| 652 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/utils/HibernateUtil.java"> | |
| 1003 | 653 | <provider selected="true" editor-type-id="text-editor"> |
| 1004 | - <state relative-caret-position="-583"> | |
| 1005 | - <caret line="10" column="3" lean-forward="true" selection-start-line="10" selection-start-column="3" selection-end-line="10" selection-end-column="3" /> | |
| 654 | + <state relative-caret-position="306"> | |
| 655 | + <caret line="20" column="1" lean-forward="false" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" /> | |
| 1006 | 656 | </state> |
| 1007 | 657 | </provider> |
| 1008 | 658 | </entry> |
| 1009 | - <entry file="file://$PROJECT_DIR$/server_core/src/main/resources/hibernate.cfg.xml"> | |
| 659 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/AccessPoint.java"> | |
| 1010 | 660 | <provider selected="true" editor-type-id="text-editor"> |
| 1011 | - <state relative-caret-position="340"> | |
| 1012 | - <caret line="20" column="26" lean-forward="true" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" /> | |
| 661 | + <state relative-caret-position="187"> | |
| 662 | + <caret line="12" column="15" lean-forward="false" selection-start-line="12" selection-start-column="15" selection-end-line="12" selection-end-column="15" /> | |
| 1013 | 663 | </state> |
| 1014 | 664 | </provider> |
| 1015 | 665 | </entry> |
| 1016 | - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/utils/HibernateUtil.java"> | |
| 666 | + <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/CalibrationServlet.java"> | |
| 1017 | 667 | <provider selected="true" editor-type-id="text-editor"> |
| 1018 | - <state relative-caret-position="306"> | |
| 1019 | - <caret line="20" column="1" lean-forward="false" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" /> | |
| 668 | + <state relative-caret-position="391"> | |
| 669 | + <caret line="23" column="28" lean-forward="true" selection-start-line="23" selection-start-column="28" selection-end-line="23" selection-end-column="28" /> | |
| 670 | + <folding> | |
| 671 | + <element signature="imports" expanded="true" /> | |
| 672 | + </folding> | |
| 1020 | 673 | </state> |
| 1021 | 674 | </provider> |
| 1022 | 675 | </entry> |
| 1023 | - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/TempRssi.java"> | |
| 676 | + <entry file="jar://C:/Program Files/Java/jdk1.8.0_66/src.zip!/java/lang/Thread.java"> | |
| 1024 | 677 | <provider selected="true" editor-type-id="text-editor"> |
| 1025 | - <state relative-caret-position="136"> | |
| 1026 | - <caret line="8" column="27" lean-forward="true" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" /> | |
| 678 | + <state relative-caret-position="215"> | |
| 679 | + <caret line="300" column="30" lean-forward="false" selection-start-line="300" selection-start-column="30" selection-end-line="300" selection-end-column="30" /> | |
| 680 | + <folding /> | |
| 1027 | 681 | </state> |
| 1028 | 682 | </provider> |
| 1029 | 683 | </entry> |
| 1030 | - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/Map.java"> | |
| 684 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/RssiRecord.java"> | |
| 1031 | 685 | <provider selected="true" editor-type-id="text-editor"> |
| 1032 | - <state relative-caret-position="238"> | |
| 1033 | - <caret line="14" column="27" lean-forward="false" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" /> | |
| 686 | + <state relative-caret-position="480"> | |
| 687 | + <caret line="30" column="23" lean-forward="false" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" /> | |
| 688 | + <folding> | |
| 689 | + <element signature="imports" expanded="false" /> | |
| 690 | + </folding> | |
| 1034 | 691 | </state> |
| 1035 | 692 | </provider> |
| 1036 | 693 | </entry> |
| 1037 | 694 | <entry file="file://$PROJECT_DIR$/server_core/src/main/java/ServerApp.java"> |
| 1038 | 695 | <provider selected="true" editor-type-id="text-editor"> |
| 1039 | - <state relative-caret-position="221"> | |
| 1040 | - <caret line="15" column="25" lean-forward="false" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> | |
| 696 | + <state relative-caret-position="288"> | |
| 697 | + <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" /> | |
| 1041 | 698 | <folding> |
| 1042 | 699 | <element signature="imports" expanded="true" /> |
| 1043 | 700 | </folding> |
| 1044 | 701 | </state> |
| 1045 | 702 | </provider> |
| 1046 | 703 | </entry> |
| 704 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/dao/DebianDao.java"> | |
| 705 | + <provider selected="true" editor-type-id="text-editor"> | |
| 706 | + <state relative-caret-position="128"> | |
| 707 | + <caret line="8" column="14" lean-forward="false" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" /> | |
| 708 | + <folding /> | |
| 709 | + </state> | |
| 710 | + </provider> | |
| 711 | + </entry> | |
| 1047 | 712 | <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/Location.java"> |
| 1048 | 713 | <provider selected="true" editor-type-id="text-editor"> |
| 1049 | - <state relative-caret-position="153"> | |
| 1050 | - <caret line="10" column="29" lean-forward="true" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" /> | |
| 714 | + <state relative-caret-position="560"> | |
| 715 | + <caret line="48" column="5" lean-forward="true" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" /> | |
| 716 | + <folding /> | |
| 1051 | 717 | </state> |
| 1052 | 718 | </provider> |
| 1053 | 719 | </entry> |
| 1054 | - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/RssiRecord.java"> | |
| 720 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/ConnectionService.java"> | |
| 1055 | 721 | <provider selected="true" editor-type-id="text-editor"> |
| 1056 | - <state relative-caret-position="493"> | |
| 1057 | - <caret line="30" column="23" lean-forward="false" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" /> | |
| 722 | + <state relative-caret-position="80"> | |
| 723 | + <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> | |
| 724 | + <folding /> | |
| 725 | + </state> | |
| 726 | + </provider> | |
| 727 | + </entry> | |
| 728 | + <entry file="file://$PROJECT_DIR$/server_servlet/pom.xml"> | |
| 729 | + <provider selected="true" editor-type-id="text-editor"> | |
| 730 | + <state relative-caret-position="64"> | |
| 731 | + <caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" /> | |
| 732 | + <folding /> | |
| 733 | + </state> | |
| 734 | + </provider> | |
| 735 | + </entry> | |
| 736 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/CalibrationService.java"> | |
| 737 | + <provider selected="true" editor-type-id="text-editor"> | |
| 738 | + <state relative-caret-position="288"> | |
| 739 | + <caret line="23" column="5" lean-forward="true" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" /> | |
| 740 | + <folding /> | |
| 741 | + </state> | |
| 742 | + </provider> | |
| 743 | + </entry> | |
| 744 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/MapService.java"> | |
| 745 | + <provider selected="true" editor-type-id="text-editor"> | |
| 746 | + <state relative-caret-position="336"> | |
| 747 | + <caret line="21" column="32" lean-forward="false" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" /> | |
| 1058 | 748 | <folding> |
| 1059 | 749 | <element signature="imports" expanded="true" /> |
| 750 | + <element signature="e#203#204#0" expanded="true" /> | |
| 751 | + <element signature="e#243#244#0" expanded="true" /> | |
| 752 | + <element signature="e#292#293#0" expanded="true" /> | |
| 753 | + <element signature="e#345#346#0" expanded="true" /> | |
| 754 | + <element signature="e#384#385#0" expanded="true" /> | |
| 755 | + <element signature="e#424#425#0" expanded="true" /> | |
| 1060 | 756 | </folding> |
| 1061 | 757 | </state> |
| 1062 | 758 | </provider> |
| 1063 | 759 | </entry> |
| 1064 | - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/AccessPoint.java"> | |
| 760 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/Map.java"> | |
| 1065 | 761 | <provider selected="true" editor-type-id="text-editor"> |
| 1066 | - <state relative-caret-position="187"> | |
| 1067 | - <caret line="12" column="15" lean-forward="false" selection-start-line="12" selection-start-column="15" selection-end-line="12" selection-end-column="15" /> | |
| 762 | + <state relative-caret-position="208"> | |
| 763 | + <caret line="27" column="4" lean-forward="true" selection-start-line="27" selection-start-column="4" selection-end-line="27" selection-end-column="4" /> | |
| 764 | + <folding /> | |
| 1068 | 765 | </state> |
| 1069 | 766 | </provider> |
| 1070 | 767 | </entry> |
| 1071 | - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/CalibrationService.java"> | |
| 768 | + <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/MapScaleServlet.java"> | |
| 1072 | 769 | <provider selected="true" editor-type-id="text-editor"> |
| 1073 | - <state relative-caret-position="391"> | |
| 1074 | - <caret line="23" column="5" lean-forward="true" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" /> | |
| 770 | + <state relative-caret-position="110"> | |
| 771 | + <caret line="19" column="29" lean-forward="false" selection-start-line="19" selection-start-column="29" selection-end-line="44" selection-end-column="1" /> | |
| 772 | + <folding> | |
| 773 | + <element signature="imports" expanded="true" /> | |
| 774 | + </folding> | |
| 1075 | 775 | </state> |
| 1076 | 776 | </provider> |
| 1077 | 777 | </entry> |
| 1078 | - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/CalibrationServlet.java"> | |
| 778 | + <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/MapByteServlet.java"> | |
| 1079 | 779 | <provider selected="true" editor-type-id="text-editor"> |
| 1080 | - <state relative-caret-position="391"> | |
| 1081 | - <caret line="23" column="28" lean-forward="true" selection-start-line="23" selection-start-column="28" selection-end-line="23" selection-end-column="28" /> | |
| 780 | + <state relative-caret-position="270"> | |
| 781 | + <caret line="20" column="8" lean-forward="true" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="8" /> | |
| 1082 | 782 | <folding> |
| 1083 | 783 | <element signature="imports" expanded="true" /> |
| 1084 | 784 | </folding> |
| 1085 | 785 | </state> |
| 1086 | 786 | </provider> |
| 1087 | 787 | </entry> |
| 1088 | - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java"> | |
| 788 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/repository/TempRssi.java"> | |
| 1089 | 789 | <provider selected="true" editor-type-id="text-editor"> |
| 1090 | - <state relative-caret-position="408"> | |
| 1091 | - <caret line="28" column="0" lean-forward="false" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" /> | |
| 790 | + <state relative-caret-position="99"> | |
| 791 | + <caret line="27" column="29" lean-forward="false" selection-start-line="27" selection-start-column="29" selection-end-line="27" selection-end-column="29" /> | |
| 792 | + <folding /> | |
| 793 | + </state> | |
| 794 | + </provider> | |
| 795 | + </entry> | |
| 796 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/MeasurementService.java"> | |
| 797 | + <provider selected="true" editor-type-id="text-editor"> | |
| 798 | + <state relative-caret-position="368"> | |
| 799 | + <caret line="23" column="60" lean-forward="true" selection-start-line="23" selection-start-column="60" selection-end-line="23" selection-end-column="60" /> | |
| 1092 | 800 | <folding> |
| 1093 | 801 | <element signature="imports" expanded="true" /> |
| 802 | + <element signature="e#279#280#0" expanded="true" /> | |
| 803 | + <element signature="e#319#320#0" expanded="true" /> | |
| 1094 | 804 | </folding> |
| 1095 | 805 | </state> |
| 1096 | 806 | </provider> |
| 1097 | 807 | </entry> |
| 1098 | 808 | <entry file="file://$PROJECT_DIR$/server_core/src/main/java/dao/HibernateDao.java"> |
| 1099 | 809 | <provider selected="true" editor-type-id="text-editor"> |
| 1100 | - <state relative-caret-position="119"> | |
| 1101 | - <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" /> | |
| 810 | + <state relative-caret-position="144"> | |
| 811 | + <caret line="74" column="32" lean-forward="false" selection-start-line="74" selection-start-column="32" selection-end-line="74" selection-end-column="32" /> | |
| 1102 | 812 | <folding> |
| 1103 | 813 | <element signature="method#HibernateDao#0;class#HibernateDao#0" expanded="false" /> |
| 1104 | 814 | <element signature="method#execTransactionProcess#0;class#HibernateDao#0" expanded="false" /> |
| ... | ... | @@ -1107,33 +817,49 @@ |
| 1107 | 817 | <element signature="e#2375#2376#0" expanded="true" /> |
| 1108 | 818 | <element signature="e#2420#2421#0" expanded="true" /> |
| 1109 | 819 | <element signature="method#getTempRssi#0;class#HibernateDao#0" expanded="false" /> |
| 1110 | - <element signature="e#2614#3102#0" expanded="false" /> | |
| 1111 | - <element signature="e#3208#3209#0" expanded="true" /> | |
| 1112 | - <element signature="e#3255#3256#0" expanded="true" /> | |
| 1113 | 820 | <element signature="method#getRssiRecord#1;class#HibernateDao#0" expanded="false" /> |
| 1114 | - <element signature="e#4246#4247#0" expanded="true" /> | |
| 1115 | - <element signature="e#4291#4292#0" expanded="true" /> | |
| 1116 | 821 | <element signature="method#getMap#0;class#HibernateDao#0" expanded="false" /> |
| 1117 | 822 | <element signature="method#getAccessPoints#0;class#HibernateDao#0" expanded="false" /> |
| 1118 | 823 | <element signature="method#getLocation#0;class#HibernateDao#0" expanded="false" /> |
| 1119 | - <element signature="class#ITransactionProcess#0;class#HibernateDao#0" expanded="false" /> | |
| 1120 | - <element signature="class#TransactionCallBack#0;class#HibernateDao#0" expanded="false" /> | |
| 1121 | 824 | </folding> |
| 1122 | 825 | </state> |
| 1123 | 826 | </provider> |
| 1124 | 827 | </entry> |
| 1125 | - <entry file="file://$PROJECT_DIR$/server_servlet/pom.xml"> | |
| 828 | + <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/APMeasurementServlet.java"> | |
| 1126 | 829 | <provider selected="true" editor-type-id="text-editor"> |
| 1127 | - <state relative-caret-position="68"> | |
| 1128 | - <caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" /> | |
| 1129 | - <folding /> | |
| 830 | + <state relative-caret-position="307"> | |
| 831 | + <caret line="34" column="41" lean-forward="false" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" /> | |
| 832 | + <folding> | |
| 833 | + <element signature="imports" expanded="true" /> | |
| 834 | + </folding> | |
| 835 | + </state> | |
| 836 | + </provider> | |
| 837 | + </entry> | |
| 838 | + <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java"> | |
| 839 | + <provider selected="true" editor-type-id="text-editor"> | |
| 840 | + <state relative-caret-position="32"> | |
| 841 | + <caret line="26" column="8" lean-forward="false" selection-start-line="26" selection-start-column="8" selection-end-line="26" selection-end-column="8" /> | |
| 842 | + <folding> | |
| 843 | + <element signature="imports" expanded="true" /> | |
| 844 | + </folding> | |
| 845 | + </state> | |
| 846 | + </provider> | |
| 847 | + </entry> | |
| 848 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java"> | |
| 849 | + <provider selected="true" editor-type-id="text-editor"> | |
| 850 | + <state relative-caret-position="438"> | |
| 851 | + <caret line="48" column="20" lean-forward="false" selection-start-line="48" selection-start-column="20" selection-end-line="48" selection-end-column="20" /> | |
| 852 | + <folding> | |
| 853 | + <element signature="e#3675#3676#0" expanded="true" /> | |
| 854 | + <element signature="e#3729#3730#0" expanded="true" /> | |
| 855 | + </folding> | |
| 1130 | 856 | </state> |
| 1131 | 857 | </provider> |
| 1132 | 858 | </entry> |
| 1133 | 859 | <entry file="file://$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml"> |
| 1134 | 860 | <provider selected="true" editor-type-id="text-editor"> |
| 1135 | - <state relative-caret-position="459"> | |
| 1136 | - <caret line="27" column="22" lean-forward="true" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" /> | |
| 861 | + <state relative-caret-position="155"> | |
| 862 | + <caret line="37" column="36" lean-forward="false" selection-start-line="37" selection-start-column="36" selection-end-line="37" selection-end-column="36" /> | |
| 1137 | 863 | <folding /> |
| 1138 | 864 | </state> |
| 1139 | 865 | </provider> | ... | ... |