Commit a860c805160f55ddb09ea1cf2a381745931344fd
1 parent
c4690ee5
Suppr dde la ligne "*.iml" du fichier .gitignore
Showing
3 changed files
with
253 additions
and
90 deletions
Show diff stats
.gitignore
@@ -72,6 +72,4 @@ buildNumber.properties | @@ -72,6 +72,4 @@ buildNumber.properties | ||
72 | .mvn/timing.properties | 72 | .mvn/timing.properties |
73 | 73 | ||
74 | # Avoid ignoring Maven wrapper jar file (.jar files are usually ignored) | 74 | # Avoid ignoring Maven wrapper jar file (.jar files are usually ignored) |
75 | -!/.mvn/wrapper/maven-wrapper.jar | ||
76 | - | ||
77 | -*.iml | ||
78 | \ No newline at end of file | 75 | \ No newline at end of file |
76 | +!/.mvn/wrapper/maven-wrapper.jar | ||
79 | \ No newline at end of file | 77 | \ No newline at end of file |
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<module type="JAVA_MODULE" version="4"> | ||
3 | + <component name="NewModuleRootManager" inherit-compiler-output="true"> | ||
4 | + <exclude-output /> | ||
5 | + <content url="file://$MODULE_DIR$" /> | ||
6 | + <orderEntry type="inheritedJdk" /> | ||
7 | + <orderEntry type="sourceFolder" forTests="false" /> | ||
8 | + </component> | ||
9 | +</module> | ||
0 | \ No newline at end of file | 10 | \ No newline at end of file |
project/.idea/workspace.xml
@@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
22 | <file leaf-file-name="PositioningServlet.java" pinned="false" current-in-tab="false"> | 22 | <file leaf-file-name="PositioningServlet.java" pinned="false" current-in-tab="false"> |
23 | <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java"> | 23 | <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java"> |
24 | <provider selected="true" editor-type-id="text-editor"> | 24 | <provider selected="true" editor-type-id="text-editor"> |
25 | - <state relative-caret-position="32"> | 25 | + <state relative-caret-position="208"> |
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" /> | 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" /> |
27 | <folding> | 27 | <folding> |
28 | <element signature="imports" expanded="true" /> | 28 | <element signature="imports" expanded="true" /> |
@@ -31,20 +31,17 @@ | @@ -31,20 +31,17 @@ | ||
31 | </provider> | 31 | </provider> |
32 | </entry> | 32 | </entry> |
33 | </file> | 33 | </file> |
34 | - <file leaf-file-name="PositioningService.java" pinned="false" current-in-tab="false"> | 34 | + <file leaf-file-name="PositioningService.java" pinned="false" current-in-tab="true"> |
35 | <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java"> | 35 | <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java"> |
36 | <provider selected="true" editor-type-id="text-editor"> | 36 | <provider selected="true" editor-type-id="text-editor"> |
37 | - <state relative-caret-position="438"> | 37 | + <state relative-caret-position="656"> |
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" /> | 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" /> |
39 | - <folding> | ||
40 | - <element signature="e#3675#3676#0" expanded="true" /> | ||
41 | - <element signature="e#3729#3730#0" expanded="true" /> | ||
42 | - </folding> | 39 | + <folding /> |
43 | </state> | 40 | </state> |
44 | </provider> | 41 | </provider> |
45 | </entry> | 42 | </entry> |
46 | </file> | 43 | </file> |
47 | - <file leaf-file-name="web.xml" pinned="false" current-in-tab="true"> | 44 | + <file leaf-file-name="web.xml" pinned="false" current-in-tab="false"> |
48 | <entry file="file://$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml"> | 45 | <entry file="file://$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml"> |
49 | <provider selected="true" editor-type-id="text-editor"> | 46 | <provider selected="true" editor-type-id="text-editor"> |
50 | <state relative-caret-position="155"> | 47 | <state relative-caret-position="155"> |
@@ -57,7 +54,7 @@ | @@ -57,7 +54,7 @@ | ||
57 | <file leaf-file-name="APMeasurementServlet.java" pinned="false" current-in-tab="false"> | 54 | <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"> | 55 | <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/APMeasurementServlet.java"> |
59 | <provider selected="true" editor-type-id="text-editor"> | 56 | <provider selected="true" editor-type-id="text-editor"> |
60 | - <state relative-caret-position="307"> | 57 | + <state relative-caret-position="320"> |
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" /> | 58 | <caret line="34" column="41" lean-forward="false" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" /> |
62 | <folding> | 59 | <folding> |
63 | <element signature="imports" expanded="true" /> | 60 | <element signature="imports" expanded="true" /> |
@@ -139,7 +136,6 @@ | @@ -139,7 +136,6 @@ | ||
139 | <foldersAlwaysOnTop value="true" /> | 136 | <foldersAlwaysOnTop value="true" /> |
140 | </navigator> | 137 | </navigator> |
141 | <panes> | 138 | <panes> |
142 | - <pane id="PackagesPane" /> | ||
143 | <pane id="ProjectPane"> | 139 | <pane id="ProjectPane"> |
144 | <subPane> | 140 | <subPane> |
145 | <PATH> | 141 | <PATH> |
@@ -152,17 +148,202 @@ | @@ -152,17 +148,202 @@ | ||
152 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 148 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
153 | </PATH_ELEMENT> | 149 | </PATH_ELEMENT> |
154 | </PATH> | 150 | </PATH> |
151 | + <PATH> | ||
152 | + <PATH_ELEMENT> | ||
153 | + <option name="myItemId" value="project" /> | ||
154 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
155 | + </PATH_ELEMENT> | ||
156 | + <PATH_ELEMENT> | ||
157 | + <option name="myItemId" value="project" /> | ||
158 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
159 | + </PATH_ELEMENT> | ||
160 | + <PATH_ELEMENT> | ||
161 | + <option name="myItemId" value="server_servlet" /> | ||
162 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
163 | + </PATH_ELEMENT> | ||
164 | + </PATH> | ||
165 | + <PATH> | ||
166 | + <PATH_ELEMENT> | ||
167 | + <option name="myItemId" value="project" /> | ||
168 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
169 | + </PATH_ELEMENT> | ||
170 | + <PATH_ELEMENT> | ||
171 | + <option name="myItemId" value="project" /> | ||
172 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
173 | + </PATH_ELEMENT> | ||
174 | + <PATH_ELEMENT> | ||
175 | + <option name="myItemId" value="server_servlet" /> | ||
176 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
177 | + </PATH_ELEMENT> | ||
178 | + <PATH_ELEMENT> | ||
179 | + <option name="myItemId" value="src" /> | ||
180 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
181 | + </PATH_ELEMENT> | ||
182 | + <PATH_ELEMENT> | ||
183 | + <option name="myItemId" value="main" /> | ||
184 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
185 | + </PATH_ELEMENT> | ||
186 | + </PATH> | ||
187 | + <PATH> | ||
188 | + <PATH_ELEMENT> | ||
189 | + <option name="myItemId" value="project" /> | ||
190 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
191 | + </PATH_ELEMENT> | ||
192 | + <PATH_ELEMENT> | ||
193 | + <option name="myItemId" value="project" /> | ||
194 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
195 | + </PATH_ELEMENT> | ||
196 | + <PATH_ELEMENT> | ||
197 | + <option name="myItemId" value="server_servlet" /> | ||
198 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
199 | + </PATH_ELEMENT> | ||
200 | + <PATH_ELEMENT> | ||
201 | + <option name="myItemId" value="src" /> | ||
202 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
203 | + </PATH_ELEMENT> | ||
204 | + <PATH_ELEMENT> | ||
205 | + <option name="myItemId" value="main" /> | ||
206 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
207 | + </PATH_ELEMENT> | ||
208 | + <PATH_ELEMENT> | ||
209 | + <option name="myItemId" value="java" /> | ||
210 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
211 | + </PATH_ELEMENT> | ||
212 | + </PATH> | ||
213 | + <PATH> | ||
214 | + <PATH_ELEMENT> | ||
215 | + <option name="myItemId" value="project" /> | ||
216 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
217 | + </PATH_ELEMENT> | ||
218 | + <PATH_ELEMENT> | ||
219 | + <option name="myItemId" value="project" /> | ||
220 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
221 | + </PATH_ELEMENT> | ||
222 | + <PATH_ELEMENT> | ||
223 | + <option name="myItemId" value="server_core" /> | ||
224 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
225 | + </PATH_ELEMENT> | ||
226 | + </PATH> | ||
227 | + <PATH> | ||
228 | + <PATH_ELEMENT> | ||
229 | + <option name="myItemId" value="project" /> | ||
230 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
231 | + </PATH_ELEMENT> | ||
232 | + <PATH_ELEMENT> | ||
233 | + <option name="myItemId" value="project" /> | ||
234 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
235 | + </PATH_ELEMENT> | ||
236 | + <PATH_ELEMENT> | ||
237 | + <option name="myItemId" value="server_core" /> | ||
238 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
239 | + </PATH_ELEMENT> | ||
240 | + <PATH_ELEMENT> | ||
241 | + <option name="myItemId" value="src" /> | ||
242 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
243 | + </PATH_ELEMENT> | ||
244 | + <PATH_ELEMENT> | ||
245 | + <option name="myItemId" value="main" /> | ||
246 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
247 | + </PATH_ELEMENT> | ||
248 | + </PATH> | ||
249 | + <PATH> | ||
250 | + <PATH_ELEMENT> | ||
251 | + <option name="myItemId" value="project" /> | ||
252 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
253 | + </PATH_ELEMENT> | ||
254 | + <PATH_ELEMENT> | ||
255 | + <option name="myItemId" value="project" /> | ||
256 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
257 | + </PATH_ELEMENT> | ||
258 | + <PATH_ELEMENT> | ||
259 | + <option name="myItemId" value="server_core" /> | ||
260 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
261 | + </PATH_ELEMENT> | ||
262 | + <PATH_ELEMENT> | ||
263 | + <option name="myItemId" value="src" /> | ||
264 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
265 | + </PATH_ELEMENT> | ||
266 | + <PATH_ELEMENT> | ||
267 | + <option name="myItemId" value="main" /> | ||
268 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
269 | + </PATH_ELEMENT> | ||
270 | + <PATH_ELEMENT> | ||
271 | + <option name="myItemId" value="java" /> | ||
272 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
273 | + </PATH_ELEMENT> | ||
274 | + </PATH> | ||
275 | + <PATH> | ||
276 | + <PATH_ELEMENT> | ||
277 | + <option name="myItemId" value="project" /> | ||
278 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
279 | + </PATH_ELEMENT> | ||
280 | + <PATH_ELEMENT> | ||
281 | + <option name="myItemId" value="project" /> | ||
282 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
283 | + </PATH_ELEMENT> | ||
284 | + <PATH_ELEMENT> | ||
285 | + <option name="myItemId" value="server_core" /> | ||
286 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
287 | + </PATH_ELEMENT> | ||
288 | + <PATH_ELEMENT> | ||
289 | + <option name="myItemId" value="src" /> | ||
290 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
291 | + </PATH_ELEMENT> | ||
292 | + <PATH_ELEMENT> | ||
293 | + <option name="myItemId" value="main" /> | ||
294 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
295 | + </PATH_ELEMENT> | ||
296 | + <PATH_ELEMENT> | ||
297 | + <option name="myItemId" value="java" /> | ||
298 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
299 | + </PATH_ELEMENT> | ||
300 | + <PATH_ELEMENT> | ||
301 | + <option name="myItemId" value="service" /> | ||
302 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
303 | + </PATH_ELEMENT> | ||
304 | + </PATH> | ||
305 | + <PATH> | ||
306 | + <PATH_ELEMENT> | ||
307 | + <option name="myItemId" value="project" /> | ||
308 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
309 | + </PATH_ELEMENT> | ||
310 | + <PATH_ELEMENT> | ||
311 | + <option name="myItemId" value="project" /> | ||
312 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
313 | + </PATH_ELEMENT> | ||
314 | + <PATH_ELEMENT> | ||
315 | + <option name="myItemId" value="server_core" /> | ||
316 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
317 | + </PATH_ELEMENT> | ||
318 | + <PATH_ELEMENT> | ||
319 | + <option name="myItemId" value="src" /> | ||
320 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
321 | + </PATH_ELEMENT> | ||
322 | + <PATH_ELEMENT> | ||
323 | + <option name="myItemId" value="main" /> | ||
324 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
325 | + </PATH_ELEMENT> | ||
326 | + <PATH_ELEMENT> | ||
327 | + <option name="myItemId" value="java" /> | ||
328 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
329 | + </PATH_ELEMENT> | ||
330 | + <PATH_ELEMENT> | ||
331 | + <option name="myItemId" value="repository" /> | ||
332 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
333 | + </PATH_ELEMENT> | ||
334 | + </PATH> | ||
155 | </subPane> | 335 | </subPane> |
156 | </pane> | 336 | </pane> |
157 | <pane id="Scratches" /> | 337 | <pane id="Scratches" /> |
158 | <pane id="Scope" /> | 338 | <pane id="Scope" /> |
339 | + <pane id="PackagesPane" /> | ||
159 | </panes> | 340 | </panes> |
160 | </component> | 341 | </component> |
161 | <component name="PropertiesComponent"> | 342 | <component name="PropertiesComponent"> |
162 | <property name="project.structure.last.edited" value="Artifacts" /> | 343 | <property name="project.structure.last.edited" value="Artifacts" /> |
163 | <property name="project.structure.proportion" value="0.15" /> | 344 | <property name="project.structure.proportion" value="0.15" /> |
164 | <property name="project.structure.side.proportion" value="0.2" /> | 345 | <property name="project.structure.side.proportion" value="0.2" /> |
165 | - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> | 346 | + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../LO54-JEE-MiniProjet" /> |
166 | </component> | 347 | </component> |
167 | <component name="RunDashboard"> | 348 | <component name="RunDashboard"> |
168 | <option name="ruleStates"> | 349 | <option name="ruleStates"> |
@@ -429,31 +610,29 @@ | @@ -429,31 +610,29 @@ | ||
429 | </component> | 610 | </component> |
430 | <component name="ToolWindowManager"> | 611 | <component name="ToolWindowManager"> |
431 | <frame x="54" y="-8" width="1320" height="784" extended-state="6" /> | 612 | <frame x="54" y="-8" width="1320" height="784" extended-state="6" /> |
432 | - <editor active="false" /> | 613 | + <editor active="true" /> |
433 | <layout> | 614 | <layout> |
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" /> | 615 | <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" /> | 616 | <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" /> |
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" /> | 617 | <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" /> | ||
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" /> | 618 | <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" /> |
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" /> | 619 | <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" /> |
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" /> | 620 | <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" /> |
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" /> | 621 | <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" /> |
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" /> | 622 | <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" /> |
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" /> | 623 | <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" /> |
624 | + <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" /> | ||
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" /> | 625 | <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" /> |
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" /> | 626 | <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" /> |
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" /> | 627 | <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" /> |
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" /> | 628 | <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" /> |
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" /> | 629 | + <window_info id="Project" active="false" 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" /> |
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" /> | 630 | <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" /> |
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" /> | 631 | <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" /> | 632 | <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" /> |
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" /> | 633 | <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" /> |
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" /> | 634 | <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" /> |
635 | + <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" /> | ||
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" /> | 636 | <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" /> |
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" /> | 637 | <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" /> | 638 | <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" /> |
@@ -463,8 +642,10 @@ | @@ -463,8 +642,10 @@ | ||
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" /> | 642 | <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" /> | 643 | <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" /> | 644 | <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" /> |
645 | + <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" /> | ||
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" /> | 646 | <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" /> |
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" /> | 647 | <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" /> |
648 | + <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" /> | ||
468 | </layout> | 649 | </layout> |
469 | </component> | 650 | </component> |
470 | <component name="VcsContentAnnotationSettings"> | 651 | <component name="VcsContentAnnotationSettings"> |
@@ -481,16 +662,49 @@ | @@ -481,16 +662,49 @@ | ||
481 | <option name="FILTER_TARGETS" value="false" /> | 662 | <option name="FILTER_TARGETS" value="false" /> |
482 | </component> | 663 | </component> |
483 | <component name="editorHistoryManager"> | 664 | <component name="editorHistoryManager"> |
484 | - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/ServerApp.java"> | 665 | + <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java"> |
485 | <provider selected="true" editor-type-id="text-editor"> | 666 | <provider selected="true" editor-type-id="text-editor"> |
486 | <state relative-caret-position="208"> | 667 | <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" /> | 668 | + <caret line="26" column="8" lean-forward="false" selection-start-line="26" selection-start-column="8" selection-end-line="26" selection-end-column="8" /> |
488 | <folding> | 669 | <folding> |
489 | <element signature="imports" expanded="true" /> | 670 | <element signature="imports" expanded="true" /> |
490 | </folding> | 671 | </folding> |
491 | </state> | 672 | </state> |
492 | </provider> | 673 | </provider> |
493 | </entry> | 674 | </entry> |
675 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java"> | ||
676 | + <provider selected="true" editor-type-id="text-editor"> | ||
677 | + <state relative-caret-position="656"> | ||
678 | + <caret line="48" column="20" lean-forward="false" selection-start-line="48" selection-start-column="20" selection-end-line="48" selection-end-column="20" /> | ||
679 | + <folding /> | ||
680 | + </state> | ||
681 | + </provider> | ||
682 | + </entry> | ||
683 | + <entry file="file://$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml"> | ||
684 | + <provider selected="true" editor-type-id="text-editor"> | ||
685 | + <state relative-caret-position="0"> | ||
686 | + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
687 | + <folding /> | ||
688 | + </state> | ||
689 | + </provider> | ||
690 | + </entry> | ||
691 | + <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/APMeasurementServlet.java"> | ||
692 | + <provider selected="true" editor-type-id="text-editor"> | ||
693 | + <state relative-caret-position="320"> | ||
694 | + <caret line="34" column="41" lean-forward="false" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" /> | ||
695 | + <folding> | ||
696 | + <element signature="imports" expanded="true" /> | ||
697 | + </folding> | ||
698 | + </state> | ||
699 | + </provider> | ||
700 | + </entry> | ||
701 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/ServerApp.java"> | ||
702 | + <provider selected="true" editor-type-id="text-editor"> | ||
703 | + <state relative-caret-position="208"> | ||
704 | + <caret line="15" column="25" lean-forward="false" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> | ||
705 | + </state> | ||
706 | + </provider> | ||
707 | + </entry> | ||
494 | <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java"> | 708 | <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java"> |
495 | <provider selected="true" editor-type-id="text-editor"> | 709 | <provider selected="true" editor-type-id="text-editor"> |
496 | <state relative-caret-position="384"> | 710 | <state relative-caret-position="384"> |
@@ -531,7 +745,6 @@ | @@ -531,7 +745,6 @@ | ||
531 | <provider selected="true" editor-type-id="text-editor"> | 745 | <provider selected="true" editor-type-id="text-editor"> |
532 | <state relative-caret-position="64"> | 746 | <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" /> | 747 | <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> | 748 | </state> |
536 | </provider> | 749 | </provider> |
537 | </entry> | 750 | </entry> |
@@ -539,9 +752,6 @@ | @@ -539,9 +752,6 @@ | ||
539 | <provider selected="true" editor-type-id="text-editor"> | 752 | <provider selected="true" editor-type-id="text-editor"> |
540 | <state relative-caret-position="464"> | 753 | <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" /> | 754 | <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> | 755 | </state> |
546 | </provider> | 756 | </provider> |
547 | </entry> | 757 | </entry> |
@@ -549,9 +759,6 @@ | @@ -549,9 +759,6 @@ | ||
549 | <provider selected="true" editor-type-id="text-editor"> | 759 | <provider selected="true" editor-type-id="text-editor"> |
550 | <state relative-caret-position="221"> | 760 | <state relative-caret-position="221"> |
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" /> | 761 | <caret line="15" column="25" lean-forward="false" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> |
552 | - <folding> | ||
553 | - <element signature="imports" expanded="true" /> | ||
554 | - </folding> | ||
555 | </state> | 762 | </state> |
556 | </provider> | 763 | </provider> |
557 | </entry> | 764 | </entry> |
@@ -587,7 +794,6 @@ | @@ -587,7 +794,6 @@ | ||
587 | <provider selected="true" editor-type-id="text-editor"> | 794 | <provider selected="true" editor-type-id="text-editor"> |
588 | <state relative-caret-position="68"> | 795 | <state relative-caret-position="68"> |
589 | <caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" /> | 796 | <caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" /> |
590 | - <folding /> | ||
591 | </state> | 797 | </state> |
592 | </provider> | 798 | </provider> |
593 | </entry> | 799 | </entry> |
@@ -595,9 +801,6 @@ | @@ -595,9 +801,6 @@ | ||
595 | <provider selected="true" editor-type-id="text-editor"> | 801 | <provider selected="true" editor-type-id="text-editor"> |
596 | <state relative-caret-position="493"> | 802 | <state relative-caret-position="493"> |
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" /> | 803 | <caret line="30" column="23" lean-forward="false" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" /> |
598 | - <folding> | ||
599 | - <element signature="imports" expanded="false" /> | ||
600 | - </folding> | ||
601 | </state> | 804 | </state> |
602 | </provider> | 805 | </provider> |
603 | </entry> | 806 | </entry> |
@@ -613,9 +816,6 @@ | @@ -613,9 +816,6 @@ | ||
613 | <provider selected="true" editor-type-id="text-editor"> | 816 | <provider selected="true" editor-type-id="text-editor"> |
614 | <state relative-caret-position="0"> | 817 | <state relative-caret-position="0"> |
615 | <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 818 | <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
616 | - <folding> | ||
617 | - <element signature="imports" expanded="true" /> | ||
618 | - </folding> | ||
619 | </state> | 819 | </state> |
620 | </provider> | 820 | </provider> |
621 | </entry> | 821 | </entry> |
@@ -630,7 +830,6 @@ | @@ -630,7 +830,6 @@ | ||
630 | <provider selected="true" editor-type-id="text-editor"> | 830 | <provider selected="true" editor-type-id="text-editor"> |
631 | <state relative-caret-position="170"> | 831 | <state relative-caret-position="170"> |
632 | <caret line="10" column="38" lean-forward="true" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" /> | 832 | <caret line="10" column="38" lean-forward="true" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" /> |
633 | - <folding /> | ||
634 | </state> | 833 | </state> |
635 | </provider> | 834 | </provider> |
636 | </entry> | 835 | </entry> |
@@ -667,9 +866,6 @@ | @@ -667,9 +866,6 @@ | ||
667 | <provider selected="true" editor-type-id="text-editor"> | 866 | <provider selected="true" editor-type-id="text-editor"> |
668 | <state relative-caret-position="391"> | 867 | <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" /> | 868 | <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> | ||
673 | </state> | 869 | </state> |
674 | </provider> | 870 | </provider> |
675 | </entry> | 871 | </entry> |
@@ -677,7 +873,6 @@ | @@ -677,7 +873,6 @@ | ||
677 | <provider selected="true" editor-type-id="text-editor"> | 873 | <provider selected="true" editor-type-id="text-editor"> |
678 | <state relative-caret-position="215"> | 874 | <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" /> | 875 | <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 /> | ||
681 | </state> | 876 | </state> |
682 | </provider> | 877 | </provider> |
683 | </entry> | 878 | </entry> |
@@ -685,9 +880,6 @@ | @@ -685,9 +880,6 @@ | ||
685 | <provider selected="true" editor-type-id="text-editor"> | 880 | <provider selected="true" editor-type-id="text-editor"> |
686 | <state relative-caret-position="480"> | 881 | <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" /> | 882 | <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> | ||
691 | </state> | 883 | </state> |
692 | </provider> | 884 | </provider> |
693 | </entry> | 885 | </entry> |
@@ -695,9 +887,6 @@ | @@ -695,9 +887,6 @@ | ||
695 | <provider selected="true" editor-type-id="text-editor"> | 887 | <provider selected="true" editor-type-id="text-editor"> |
696 | <state relative-caret-position="288"> | 888 | <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" /> | 889 | <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" /> |
698 | - <folding> | ||
699 | - <element signature="imports" expanded="true" /> | ||
700 | - </folding> | ||
701 | </state> | 890 | </state> |
702 | </provider> | 891 | </provider> |
703 | </entry> | 892 | </entry> |
@@ -705,7 +894,6 @@ | @@ -705,7 +894,6 @@ | ||
705 | <provider selected="true" editor-type-id="text-editor"> | 894 | <provider selected="true" editor-type-id="text-editor"> |
706 | <state relative-caret-position="128"> | 895 | <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" /> | 896 | <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> | 897 | </state> |
710 | </provider> | 898 | </provider> |
711 | </entry> | 899 | </entry> |
@@ -713,23 +901,14 @@ | @@ -713,23 +901,14 @@ | ||
713 | <provider selected="true" editor-type-id="text-editor"> | 901 | <provider selected="true" editor-type-id="text-editor"> |
714 | <state relative-caret-position="560"> | 902 | <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" /> | 903 | <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 /> | ||
717 | - </state> | ||
718 | - </provider> | ||
719 | - </entry> | ||
720 | - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/ConnectionService.java"> | ||
721 | - <provider selected="true" editor-type-id="text-editor"> | ||
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> | 904 | </state> |
726 | </provider> | 905 | </provider> |
727 | </entry> | 906 | </entry> |
907 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/ConnectionService.java" /> | ||
728 | <entry file="file://$PROJECT_DIR$/server_servlet/pom.xml"> | 908 | <entry file="file://$PROJECT_DIR$/server_servlet/pom.xml"> |
729 | <provider selected="true" editor-type-id="text-editor"> | 909 | <provider selected="true" editor-type-id="text-editor"> |
730 | <state relative-caret-position="64"> | 910 | <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" /> | 911 | <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> | 912 | </state> |
734 | </provider> | 913 | </provider> |
735 | </entry> | 914 | </entry> |
@@ -737,7 +916,6 @@ | @@ -737,7 +916,6 @@ | ||
737 | <provider selected="true" editor-type-id="text-editor"> | 916 | <provider selected="true" editor-type-id="text-editor"> |
738 | <state relative-caret-position="288"> | 917 | <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" /> | 918 | <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> | 919 | </state> |
742 | </provider> | 920 | </provider> |
743 | </entry> | 921 | </entry> |
@@ -745,15 +923,6 @@ | @@ -745,15 +923,6 @@ | ||
745 | <provider selected="true" editor-type-id="text-editor"> | 923 | <provider selected="true" editor-type-id="text-editor"> |
746 | <state relative-caret-position="336"> | 924 | <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" /> | 925 | <caret line="21" column="32" lean-forward="false" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" /> |
748 | - <folding> | ||
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" /> | ||
756 | - </folding> | ||
757 | </state> | 926 | </state> |
758 | </provider> | 927 | </provider> |
759 | </entry> | 928 | </entry> |
@@ -761,7 +930,6 @@ | @@ -761,7 +930,6 @@ | ||
761 | <provider selected="true" editor-type-id="text-editor"> | 930 | <provider selected="true" editor-type-id="text-editor"> |
762 | <state relative-caret-position="208"> | 931 | <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" /> | 932 | <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 /> | ||
765 | </state> | 933 | </state> |
766 | </provider> | 934 | </provider> |
767 | </entry> | 935 | </entry> |
@@ -779,9 +947,6 @@ | @@ -779,9 +947,6 @@ | ||
779 | <provider selected="true" editor-type-id="text-editor"> | 947 | <provider selected="true" editor-type-id="text-editor"> |
780 | <state relative-caret-position="270"> | 948 | <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" /> | 949 | <caret line="20" column="8" lean-forward="true" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="8" /> |
782 | - <folding> | ||
783 | - <element signature="imports" expanded="true" /> | ||
784 | - </folding> | ||
785 | </state> | 950 | </state> |
786 | </provider> | 951 | </provider> |
787 | </entry> | 952 | </entry> |
@@ -789,7 +954,6 @@ | @@ -789,7 +954,6 @@ | ||
789 | <provider selected="true" editor-type-id="text-editor"> | 954 | <provider selected="true" editor-type-id="text-editor"> |
790 | <state relative-caret-position="99"> | 955 | <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" /> | 956 | <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> | 957 | </state> |
794 | </provider> | 958 | </provider> |
795 | </entry> | 959 | </entry> |
@@ -797,11 +961,6 @@ | @@ -797,11 +961,6 @@ | ||
797 | <provider selected="true" editor-type-id="text-editor"> | 961 | <provider selected="true" editor-type-id="text-editor"> |
798 | <state relative-caret-position="368"> | 962 | <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" /> | 963 | <caret line="23" column="60" lean-forward="true" selection-start-line="23" selection-start-column="60" selection-end-line="23" selection-end-column="60" /> |
800 | - <folding> | ||
801 | - <element signature="imports" expanded="true" /> | ||
802 | - <element signature="e#279#280#0" expanded="true" /> | ||
803 | - <element signature="e#319#320#0" expanded="true" /> | ||
804 | - </folding> | ||
805 | </state> | 964 | </state> |
806 | </provider> | 965 | </provider> |
807 | </entry> | 966 | </entry> |
@@ -827,7 +986,7 @@ | @@ -827,7 +986,7 @@ | ||
827 | </entry> | 986 | </entry> |
828 | <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/APMeasurementServlet.java"> | 987 | <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/APMeasurementServlet.java"> |
829 | <provider selected="true" editor-type-id="text-editor"> | 988 | <provider selected="true" editor-type-id="text-editor"> |
830 | - <state relative-caret-position="307"> | 989 | + <state relative-caret-position="320"> |
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" /> | 990 | <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> | 991 | <folding> |
833 | <element signature="imports" expanded="true" /> | 992 | <element signature="imports" expanded="true" /> |
@@ -837,7 +996,7 @@ | @@ -837,7 +996,7 @@ | ||
837 | </entry> | 996 | </entry> |
838 | <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java"> | 997 | <entry file="file://$PROJECT_DIR$/server_servlet/src/main/java/PositioningServlet.java"> |
839 | <provider selected="true" editor-type-id="text-editor"> | 998 | <provider selected="true" editor-type-id="text-editor"> |
840 | - <state relative-caret-position="32"> | 999 | + <state relative-caret-position="208"> |
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" /> | 1000 | <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> | 1001 | <folding> |
843 | <element signature="imports" expanded="true" /> | 1002 | <element signature="imports" expanded="true" /> |
@@ -845,21 +1004,18 @@ | @@ -845,21 +1004,18 @@ | ||
845 | </state> | 1004 | </state> |
846 | </provider> | 1005 | </provider> |
847 | </entry> | 1006 | </entry> |
848 | - <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java"> | 1007 | + <entry file="file://$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml"> |
849 | <provider selected="true" editor-type-id="text-editor"> | 1008 | <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> | 1009 | + <state relative-caret-position="155"> |
1010 | + <caret line="37" column="36" lean-forward="false" selection-start-line="37" selection-start-column="36" selection-end-line="37" selection-end-column="36" /> | ||
1011 | + <folding /> | ||
856 | </state> | 1012 | </state> |
857 | </provider> | 1013 | </provider> |
858 | </entry> | 1014 | </entry> |
859 | - <entry file="file://$PROJECT_DIR$/server_servlet/src/main/webapp/WEB-INF/web.xml"> | 1015 | + <entry file="file://$PROJECT_DIR$/server_core/src/main/java/service/PositioningService.java"> |
860 | <provider selected="true" editor-type-id="text-editor"> | 1016 | <provider selected="true" editor-type-id="text-editor"> |
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" /> | 1017 | + <state relative-caret-position="656"> |
1018 | + <caret line="48" column="20" lean-forward="false" selection-start-line="48" selection-start-column="20" selection-end-line="48" selection-end-column="20" /> | ||
863 | <folding /> | 1019 | <folding /> |
864 | </state> | 1020 | </state> |
865 | </provider> | 1021 | </provider> |