|
|
@@ -7,7 +7,6 @@
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="0c822a5a-f421-4f3c-b941-5c2809c4546f" name="Default" comment="">
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/api/DummySnapshotDBAPI.java" afterPath="$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/api/DummySnapshotDBAPI.java" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/Snapshot.java" afterPath="$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/Snapshot.java" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.xml" afterPath="$PROJECT_DIR$/build.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
@@ -44,21 +43,11 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true">
|
|
|
+ <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/build.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.16886544" vertical-offset="4121" max-vertical-offset="4500">
|
|
|
- <caret line="279" column="0" selection-start-line="279" selection-start-column="0" selection-end-line="279" selection-end-column="0" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="CheckNonFastForwardHook.java" pinned="false" current="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/git/handler/hook/CheckNonFastForwardHook.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="465">
|
|
|
- <caret line="18" column="23" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
|
|
|
+ <state vertical-scroll-proportion="-10.038462" vertical-offset="3639" max-vertical-offset="4635">
|
|
|
+ <caret line="260" column="92" selection-start-line="260" selection-start-column="92" selection-end-line="260" selection-end-column="92" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
@@ -78,57 +67,67 @@
|
|
|
<entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/Snapshot.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="405">
|
|
|
- <caret line="16" column="34" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
|
|
|
+ <caret line="9" column="25" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="JSONSource.java" pinned="false" current="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/JSONSource.java">
|
|
|
+ <file leaf-file-name="WLProject.java" pinned="false" current="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/WLProject.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="270">
|
|
|
- <caret line="7" column="27" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="27" />
|
|
|
+ <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="495">
|
|
|
+ <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="DummySnapshotAPI.java" pinned="false" current="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/api/DummySnapshotAPI.java">
|
|
|
+ <file leaf-file-name="WLDataModel.java" pinned="false" current="true" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/WLDataModel.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="420">
|
|
|
- <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
|
|
|
+ <state vertical-scroll-proportion="0.55263156" vertical-offset="9" max-vertical-offset="450">
|
|
|
+ <caret line="16" column="33" selection-start-line="16" selection-start-column="33" selection-end-line="16" selection-end-column="33" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="WLBridgedProject.java" pinned="false" current="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/bridge/WLBridgedProject.java">
|
|
|
+ <file leaf-file-name="SnapshotDBAPI.java" pinned="false" current="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/api/SnapshotDBAPI.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0" vertical-offset="270" max-vertical-offset="945">
|
|
|
- <caret line="7" column="39" selection-start-line="7" selection-start-column="39" selection-end-line="7" selection-end-column="39" />
|
|
|
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
|
|
|
+ <caret line="10" column="27" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="SnapshotAPI.java" pinned="false" current="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/api/SnapshotAPI.java">
|
|
|
+ <file leaf-file-name="JSONSource.java" pinned="false" current="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/JSONSource.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
|
|
|
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="270">
|
|
|
+ <caret line="7" column="27" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="27" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="DummySnapshotAPI.java" pinned="false" current="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/api/DummySnapshotAPI.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="420">
|
|
|
<caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="WLReceivePackFactory.java" pinned="false" current="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java">
|
|
|
+ <file leaf-file-name="WLBridgedProject.java" pinned="false" current="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/bridge/WLBridgedProject.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">
|
|
|
- <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
|
|
|
+ <state vertical-scroll-proportion="0.0" vertical-offset="270" max-vertical-offset="945">
|
|
|
+ <caret line="7" column="39" selection-start-line="7" selection-start-column="39" selection-end-line="7" selection-end-column="39" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
@@ -147,9 +146,6 @@
|
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="changedFiles">
|
|
|
<list>
|
|
|
- <option value="$PROJECT_DIR$/test/uk/ac/ic/test/MainTests.java" />
|
|
|
- <option value="$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/MainTests.java" />
|
|
|
- <option value="$PROJECT_DIR$/writelatex-git-bridge.properties" />
|
|
|
<option value="$PROJECT_DIR$/writelatex-git-bridge.iml" />
|
|
|
<option value="$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/git/WLUploadPackFactory.java" />
|
|
|
<option value="$PROJECT_DIR$/writelatex-git-bridge.xml" />
|
|
|
@@ -196,8 +192,11 @@
|
|
|
<option value="$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/api/DummySnapshotDBAPI.java" />
|
|
|
<option value="$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/bridge/WLBridgedProject.java" />
|
|
|
<option value="$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/JSONSource.java" />
|
|
|
+ <option value="$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/WLProjectModel.java" />
|
|
|
+ <option value="$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/WLProject.java" />
|
|
|
<option value="$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/Snapshot.java" />
|
|
|
<option value="$PROJECT_DIR$/build.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/WLDataModel.java" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -825,7 +824,7 @@
|
|
|
<property name="GenerateAntBuildDialog.inclineRuntiemClasspath" value="false" />
|
|
|
<property name="GenerateAntBuildDialog.generateIdeaHomeProperty" value="false" />
|
|
|
<property name="GenerateAntBuildDialog.outputFileNameProperty" value="writelatex-git-bridge" />
|
|
|
- <property name="last_opened_file_path" value="$PROJECT_DIR$/libs/gson-2.3-javadoc.jar!/" />
|
|
|
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/libs/async-http-client-1.8.14-javadoc.jar!/" />
|
|
|
<property name="recentsLimit" value="5" />
|
|
|
<property name="dynamic.classpath" value="false" />
|
|
|
<property name="OverrideImplement.combined" value="true" />
|
|
|
@@ -1057,7 +1056,7 @@
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="0" y="23" width="1366" height="741" extended-state="6" />
|
|
|
- <editor active="false" />
|
|
|
+ <editor active="true" />
|
|
|
<layout>
|
|
|
<window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" x="100" y="123" width="1166" height="541" />
|
|
|
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
|
@@ -1065,7 +1064,7 @@
|
|
|
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32886904" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Ant Build" active="true" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18814056" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18814056" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
|
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
|
|
@@ -1131,14 +1130,6 @@
|
|
|
</buildFile>
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/bridge/WLBridgedProjectTests.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0" vertical-offset="105" max-vertical-offset="315">
|
|
|
- <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/MainTests.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="315">
|
|
|
@@ -1413,14 +1404,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/api/SnapshotDBAPI.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
|
|
|
- <caret line="10" column="27" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeServer.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1200">
|
|
|
@@ -1485,6 +1468,30 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/JSONSource.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="270">
|
|
|
+ <caret line="7" column="27" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="27" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/Snapshot.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="405">
|
|
|
+ <caret line="9" column="25" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/WLProject.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="495">
|
|
|
+ <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/api/DummySnapshotDBAPI.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="645">
|
|
|
@@ -1493,26 +1500,26 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/JSONSource.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/api/SnapshotDBAPI.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="270">
|
|
|
- <caret line="7" column="27" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="27" />
|
|
|
+ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
|
|
|
+ <caret line="10" column="27" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/Snapshot.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/build.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="405">
|
|
|
- <caret line="16" column="34" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
|
|
|
+ <state vertical-scroll-proportion="-10.038462" vertical-offset="3639" max-vertical-offset="4635">
|
|
|
+ <caret line="260" column="92" selection-start-line="260" selection-start-column="92" selection-end-line="260" selection-end-column="92" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/build.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/writelatex/WLDataModel.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.16886544" vertical-offset="4121" max-vertical-offset="4500">
|
|
|
- <caret line="279" column="0" selection-start-line="279" selection-start-column="0" selection-end-line="279" selection-end-column="0" />
|
|
|
+ <state vertical-scroll-proportion="0.55263156" vertical-offset="9" max-vertical-offset="450">
|
|
|
+ <caret line="16" column="33" selection-start-line="16" selection-start-column="33" selection-end-line="16" selection-end-column="33" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
@@ -1596,7 +1603,7 @@
|
|
|
</state>
|
|
|
<state key="ProjectLibrariesConfigurable.UI">
|
|
|
<settings>
|
|
|
- <last-edited>org.eclipse.jgit.http.server-3.5.1.201410131835-r</last-edited>
|
|
|
+ <last-edited>async-http-client-1.8.14</last-edited>
|
|
|
<splitter-proportions>
|
|
|
<option name="proportions">
|
|
|
<list>
|