From 95ed92c501456b2ad8476fb50eff1334f0d76e96 Mon Sep 17 00:00:00 2001
From: samiyac <samiya17094@iiitd.ac.in>
Date: Thu, 21 Mar 2019 01:08:53 +0530
Subject: [PATCH 1/8] Relativizes paths to aux files

---
 .../org/jabref/gui/groups/GroupDialog.java    | 32 +++++++++-
 .../LibraryPropertiesDialog.fxml              | 10 +++-
 .../LibraryPropertiesDialogView.java          | 17 +++++-
 .../LibraryPropertiesDialogViewModel.java     | 19 ++++++
 .../logic/exporter/MetaDataSerializer.java    |  6 +-
 .../logic/importer/util/GroupsParser.java     | 13 +++--
 .../logic/importer/util/MetaDataParser.java   |  7 ++-
 .../model/database/BibDatabaseContext.java    |  2 +-
 .../org/jabref/model/groups/TexGroup.java     | 58 ++++++++++++++++---
 .../org/jabref/model/metadata/MetaData.java   | 20 +++++++
 src/main/resources/l10n/JabRef_en.properties  |  1 +
 .../exporter/BibtexDatabaseWriterTest.java    |  3 +-
 .../logic/exporter/GroupSerializerTest.java   |  3 +-
 .../importer/fileformat/BibtexParserTest.java |  4 +-
 .../logic/importer/util/GroupsParserTest.java | 25 ++++----
 .../org/jabref/model/groups/TexGroupTest.java | 24 +++++++-
 16 files changed, 205 insertions(+), 39 deletions(-)

diff --git a/src/main/java/org/jabref/gui/groups/GroupDialog.java b/src/main/java/org/jabref/gui/groups/GroupDialog.java
index 94c9f519fa7..d4f863c7a68 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialog.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialog.java
@@ -1,8 +1,10 @@
 package org.jabref.gui.groups;
 
 import java.io.IOException;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -58,6 +60,7 @@
 import org.jabref.model.groups.SearchGroup;
 import org.jabref.model.groups.TexGroup;
 import org.jabref.model.groups.WordKeywordGroup;
+import org.jabref.model.metadata.MetaData;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.JabRefPreferences;
 
@@ -90,6 +93,7 @@ class GroupDialog extends BaseDialog<AbstractGroup> {
     private final RadioButton unionButton = new RadioButton(Localization.lang("Include subgroups: When selected, view entries contained in this group or its subgroups"));
     private final DialogService dialogService;
     private final JabRefPreferences prefs;
+    private final BasePanel basePanel;
 
     // for KeywordGroup
     private final TextField keywordGroupSearchTerm = new TextField();
@@ -144,6 +148,7 @@ public GroupDialog(DialogService dialogService, BasePanel basePanel, JabRefPrefe
 
         this.dialogService = dialogService;
         this.prefs = prefs;
+        this.basePanel = basePanel;
 
         // set default values (overwritten if editedGroup != null)
         keywordGroupSearchField.setText(prefs.get(JabRefPreferences.GROUPS_DEFAULT_FIELD));
@@ -330,7 +335,7 @@ groupName, getContext(),
                         }
                     } else if (texRadioButton.isSelected()) {
                         resultingGroup = new TexGroup(groupName, getContext(),
-                                Paths.get(texGroupFilePath.getText().trim()), new DefaultAuxParser(new BibDatabase()), Globals.getFileUpdateMonitor());
+                                                      Paths.get(texGroupFilePath.getText().trim()), new DefaultAuxParser(new BibDatabase()), Globals.getFileUpdateMonitor(), basePanel.getBibDatabaseContext().getMetaData());
                     }
 
                     resultingGroup.setColor(colorField.getValue());
@@ -610,7 +615,30 @@ private void openBrowseDialog() {
             .addExtensionFilter(StandardFileType.AUX)
             .withDefaultExtension(StandardFileType.AUX)
             .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)).build();
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> texGroupFilePath.setText(file.toAbsolutePath().toString()));
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> texGroupFilePath.setText(relativize(file.toAbsolutePath()).toString()));
+    }
+
+    private Path relativize(Path path) {
+        List<Path> fileDirectories = getFileDirectoriesAsPaths();
+        if (!path.isAbsolute()) {
+            return path;
+        }
+
+        for (Path directory : fileDirectories) {
+            if (path.startsWith(directory)) {
+                return directory.relativize(path);
+            }
+        }
+        return path;
+    }
+
+    private List<Path> getFileDirectoriesAsPaths() {
+        List<Path> fileDirs = new ArrayList<>();
+        MetaData metaData = basePanel.getBibDatabaseContext().getMetaData();
+        metaData.getLaTexFileDirectory(prefs.getFilePreferences().getUser())
+                .ifPresent(LaTexFileDirectory -> fileDirs.add(Paths.get(LaTexFileDirectory).toAbsolutePath().normalize()));
+
+        return fileDirs;
     }
 
     private String fromTextFlowToHTMLString(TextFlow textFlow) {
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
index 126d9e959b6..9352cba7ac4 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
@@ -26,6 +26,7 @@
                         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                         <RowConstraints minHeight="-Infinity" prefHeight="50.0" vgrow="SOMETIMES" />
                         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="ALWAYS" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="ALWAYS" />
                         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                         <RowConstraints minHeight="-Infinity" prefHeight="50.0" vgrow="ALWAYS" />
                         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -40,10 +41,13 @@
                         <Label text="%User-specific file directory" GridPane.rowIndex="3" />
                         <TextField fx:id="userSpecificFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="3" />
                         <Button fx:id="browseUserSpefiicFileDir" mnemonicParsing="false" onAction="#browseUserSpecificFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+                        <Label text="%LaTex file directory" GridPane.rowIndex="4" />
+                        <TextField fx:id="LaTexFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                        <Button fx:id="browseLatexFileDir" mnemonicParsing="false" onAction="#browseLaTexFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="4" />
                         <Label alignment="TOP_LEFT" styleClass="sectionHeader" text="%Override default file directories" GridPane.columnSpan="3" GridPane.rowIndex="1" />
-                        <Label alignment="TOP_LEFT" styleClass="sectionHeader" text="%Library protection" GridPane.columnSpan="3" GridPane.rowIndex="4" />
-                        <CheckBox fx:id="protect" mnemonicParsing="false" text="%Refuse to save the library before external changes have been reviewed." GridPane.columnSpan="3" GridPane.rowIndex="5" />
-                        <Label styleClass="sectionHeader" text="%Export sort order" GridPane.rowIndex="6" />
+                        <Label alignment="TOP_LEFT" styleClass="sectionHeader" text="%Library protection" GridPane.columnSpan="3" GridPane.rowIndex="5" />
+                        <CheckBox fx:id="protect" mnemonicParsing="false" text="%Refuse to save the library before external changes have been reviewed." GridPane.columnSpan="3" GridPane.rowIndex="6" />
+                        <Label styleClass="sectionHeader" text="%Export sort order" GridPane.rowIndex="7" />
                     </children>
                 </GridPane>
             </children>
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
index 8ed238faf8a..cbb666fe069 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
@@ -36,6 +36,8 @@ public class LibraryPropertiesDialogView extends BaseDialog<Void> {
     @FXML private Button browseGeneralFileDir;
     @FXML private TextField userSpecificFileDirectory;
     @FXML private Button browseUserSpefiicFileDir;
+    @FXML private TextField LaTexFileDirectory;
+    @FXML private Button browseLatexFileDir;
     @FXML private CheckBox protect;
     @Inject private PreferencesService preferencesService;
 
@@ -70,6 +72,7 @@ private void initialize() {
 
         generalFileDirectory.textProperty().bindBidirectional(viewModel.generalFileDirectoryPropertyProperty());
         userSpecificFileDirectory.textProperty().bindBidirectional(viewModel.userSpecificFileDirectoryProperty());
+        LaTexFileDirectory.textProperty().bindBidirectional(viewModel.LaTexFileDirectoryProperty());
 
         encoding.itemsProperty().bind(viewModel.encodingsProperty());
         encoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
@@ -112,6 +115,11 @@ public void browseUserSpecificFileDirectory(ActionEvent event) {
         viewModel.browseUserDir();
     }
 
+    @FXML
+    void browseLaTexFileDirectory(ActionEvent event) {
+        viewModel.browseLaTexDir();
+    }
+
     private void storeSettings() {
         //FIXME: Move to viewModel until fieldFormatterCleanupsPanel is property implemented
         MetaData metaData = panel.getBibDatabaseContext().getMetaData();
@@ -134,6 +142,13 @@ private void storeSettings() {
             metaData.setUserFileDirectory(preferencesService.getUser(), text);
         }
 
+        text = viewModel.LaTexFileDirectoryProperty().getValue();
+        if (text.isEmpty()) {
+            metaData.clearLaTexFileDirectory(preferencesService.getUser());
+        } else {
+            metaData.setLaTexFileDirectory(preferencesService.getUser(), text);
+        }
+
         if (viewModel.libraryProtectedProperty().getValue()) {
             metaData.markAsProtected();
         } else {
@@ -165,7 +180,7 @@ private void storeSettings() {
 
         boolean changed = saveOrderConfigChanged || encodingChanged
                           || viewModel.generalFileDirChanged() || viewModel.userFileDirChanged()
-                          || viewModel.protectedValueChanged() || saveActionsChanged;
+                          || viewModel.protectedValueChanged() || saveActionsChanged || viewModel.LaTexFileDirChanged();
         // ... if so, mark base changed. Prevent the Undo button from removing
         // change marking:
         if (changed) {
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
index 05f3982d7e0..1648445c37f 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
@@ -25,6 +25,7 @@ public class LibraryPropertiesDialogViewModel {
 
     private final StringProperty generalFileDirectoryProperty = new SimpleStringProperty("");
     private final StringProperty userSpecificFileDirectoryProperty = new SimpleStringProperty("");
+    private final StringProperty LaTexFileDirectoryProperty = new SimpleStringProperty("");
     private final ListProperty<Charset> encodingsProperty = new SimpleListProperty<>(FXCollections.observableArrayList(Encodings.getCharsets()));
     private final ObjectProperty<Charset> selectedEncodingPropety = new SimpleObjectProperty<>(Encodings.getCharsets().get(0));
     private final BooleanProperty libraryProtectedProperty = new SimpleBooleanProperty();
@@ -36,6 +37,7 @@ public class LibraryPropertiesDialogViewModel {
 
     private final String oldUserSpecificFileDir;
     private final String oldGeneralFileDir;
+    private final String oldLaTexFileDir;
     private final boolean oldLibraryProtected;
 
     public LibraryPropertiesDialogViewModel(BasePanel panel, DialogService dialogService, PreferencesService preferencesService) {
@@ -59,8 +61,12 @@ public LibraryPropertiesDialogViewModel(BasePanel panel, DialogService dialogSer
         Optional<String> fileDI = metaData.getUserFileDirectory(preferencesService.getUser());
         fileDI.ifPresent(userSpecificFileDirectoryProperty::setValue);
 
+        Optional<String> fileDL = metaData.getLaTexFileDirectory(preferencesService.getUser());
+        fileDL.ifPresent(LaTexFileDirectoryProperty::setValue);
+
         oldUserSpecificFileDir = generalFileDirectoryProperty.getValue();
         oldGeneralFileDir = userSpecificFileDirectoryProperty.getValue();
+        oldLaTexFileDir = LaTexFileDirectoryProperty.getValue();
 
         libraryProtectedProperty.setValue(metaData.isProtected());
         oldLibraryProtected = libraryProtectedProperty.getValue();
@@ -74,6 +80,10 @@ public StringProperty userSpecificFileDirectoryProperty() {
         return this.userSpecificFileDirectoryProperty;
     }
 
+    public StringProperty LaTexFileDirectoryProperty() {
+        return this.LaTexFileDirectoryProperty;
+    }
+
     public ListProperty<Charset> encodingsProperty() {
         return this.encodingsProperty;
     }
@@ -90,6 +100,10 @@ public void browseUserDir() {
         dialogService.showDirectorySelectionDialog(directoryDialogConfiguration).ifPresent(dir -> userSpecificFileDirectoryProperty.setValue(dir.toAbsolutePath().toString()));
     }
 
+    public void browseLaTexDir() {
+        dialogService.showDirectorySelectionDialog(directoryDialogConfiguration).ifPresent(dir -> LaTexFileDirectoryProperty.setValue(dir.toAbsolutePath().toString()));
+    }
+
     public BooleanProperty libraryProtectedProperty() {
         return this.libraryProtectedProperty;
     }
@@ -102,6 +116,10 @@ public boolean userFileDirChanged() {
         return !oldUserSpecificFileDir.equals(userSpecificFileDirectoryProperty.getValue());
     }
 
+    public boolean LaTexFileDirChanged() {
+        return !oldLaTexFileDir.equals(LaTexFileDirectoryProperty.getValue());
+    }
+
     public boolean protectedValueChanged() {
         return !oldLibraryProtected == libraryProtectedProperty.getValue();
     }
@@ -113,4 +131,5 @@ public BooleanProperty encodingDisableProperty() {
     public BooleanProperty protectDisableProperty() {
         return protectDisableProperty;
     }
+
 }
diff --git a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
index 92944665575..c5a70e13c6a 100644
--- a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
+++ b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
@@ -43,6 +43,8 @@ public static Map<String, String> getSerializedStringMap(MetaData metaData,
                 path -> stringyMetaData.put(MetaData.FILE_DIRECTORY, Collections.singletonList(path.trim())));
         metaData.getUserFileDirectories().forEach((user, path) -> stringyMetaData
                 .put(MetaData.FILE_DIRECTORY + '-' + user, Collections.singletonList(path.trim())));
+        metaData.getLaTexFileDirectories().forEach((user, path) -> stringyMetaData
+                .put(MetaData.FILE_DIRECTORY + 'l' + user, Collections.singletonList(path.trim())));
 
         for (ContentSelector selector: metaData.getContentSelectorList()) {
                 stringyMetaData.put(MetaData.SELECTOR_META_PREFIX + selector.getFieldName(), selector.getValues());
@@ -54,7 +56,7 @@ public static Map<String, String> getSerializedStringMap(MetaData metaData,
         // Write groups if present.
         // Skip this if only the root node exists (which is always the AllEntriesGroup).
         metaData.getGroups().filter(root -> root.getNumberOfChildren() > 0).ifPresent(
-                root -> serializedMetaData.put(MetaData.GROUPSTREE, serializeGroups(root)));
+                root -> serializedMetaData.put(MetaData.GROUPSTREE, serializeGroups(root, metaData)));
 
         // finally add all unknown meta data items to the serialization map
         Map<String, List<String>> unknownMetaData = metaData.getUnknownMetaData();
@@ -113,7 +115,7 @@ private static Map<String, List<String>> serializeCiteKeyPattern(MetaData metaDa
         return stringyPattern;
     }
 
-    private static String serializeGroups(GroupTreeNode root) {
+    private static String serializeGroups(GroupTreeNode root, MetaData metaData) {
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append(OS.NEWLINE);
 
diff --git a/src/main/java/org/jabref/logic/importer/util/GroupsParser.java b/src/main/java/org/jabref/logic/importer/util/GroupsParser.java
index ca04fafd0ca..4c9365b0dd8 100644
--- a/src/main/java/org/jabref/logic/importer/util/GroupsParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/GroupsParser.java
@@ -24,6 +24,7 @@
 import org.jabref.model.groups.SearchGroup;
 import org.jabref.model.groups.TexGroup;
 import org.jabref.model.groups.WordKeywordGroup;
+import org.jabref.model.metadata.MetaData;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
 
@@ -35,7 +36,7 @@ public class GroupsParser {
     private GroupsParser() {
     }
 
-    public static GroupTreeNode importGroups(List<String> orderedData, Character keywordSeparator, FileUpdateMonitor fileMonitor)
+    public static GroupTreeNode importGroups(List<String> orderedData, Character keywordSeparator, FileUpdateMonitor fileMonitor, MetaData metaData)
             throws ParseException {
         try {
             GroupTreeNode cursor = null;
@@ -52,7 +53,7 @@ public static GroupTreeNode importGroups(List<String> orderedData, Character key
                     throw new ParseException("Expected \"" + string + "\" to contain whitespace");
                 }
                 int level = Integer.parseInt(string.substring(0, spaceIndex));
-                AbstractGroup group = GroupsParser.fromString(string.substring(spaceIndex + 1), keywordSeparator, fileMonitor);
+                AbstractGroup group = GroupsParser.fromString(string.substring(spaceIndex + 1), keywordSeparator, fileMonitor, metaData);
                 GroupTreeNode newNode = GroupTreeNode.fromGroup(group);
                 if (cursor == null) {
                     // create new root
@@ -84,7 +85,7 @@ public static GroupTreeNode importGroups(List<String> orderedData, Character key
      * @throws ParseException If an error occurred and a group could not be created,
      *                        e.g. due to a malformed regular expression.
      */
-    public static AbstractGroup fromString(String s, Character keywordSeparator, FileUpdateMonitor fileMonitor)
+    public static AbstractGroup fromString(String s, Character keywordSeparator, FileUpdateMonitor fileMonitor, MetaData metaData)
             throws ParseException {
         if (s.startsWith(MetadataSerializationConfiguration.KEYWORD_GROUP_ID)) {
             return keywordGroupFromString(s, keywordSeparator);
@@ -108,13 +109,13 @@ public static AbstractGroup fromString(String s, Character keywordSeparator, Fil
             return automaticKeywordGroupFromString(s);
         }
         if (s.startsWith(MetadataSerializationConfiguration.TEX_GROUP_ID)) {
-            return texGroupFromString(s, fileMonitor);
+            return texGroupFromString(s, fileMonitor, metaData);
         }
 
         throw new ParseException("Unknown group: " + s);
     }
 
-    private static AbstractGroup texGroupFromString(String string, FileUpdateMonitor fileMonitor) throws ParseException {
+    private static AbstractGroup texGroupFromString(String string, FileUpdateMonitor fileMonitor, MetaData metaData) throws ParseException {
         QuotedStringTokenizer tok = new QuotedStringTokenizer(string.substring(MetadataSerializationConfiguration.TEX_GROUP_ID
                 .length()), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
 
@@ -122,7 +123,7 @@ private static AbstractGroup texGroupFromString(String string, FileUpdateMonitor
         GroupHierarchyType context = GroupHierarchyType.getByNumberOrDefault(Integer.parseInt(tok.nextToken()));
         try {
             Path path = Paths.get(tok.nextToken());
-            TexGroup newGroup = new TexGroup(name, context, path, new DefaultAuxParser(new BibDatabase()), fileMonitor);
+            TexGroup newGroup = new TexGroup(name, context, path, new DefaultAuxParser(new BibDatabase()), fileMonitor, metaData);
             addGroupDetails(tok, newGroup);
             return newGroup;
         } catch (InvalidPathException | IOException ex) {
diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
index ecd8e4ba4cf..e85ce89cdc2 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -60,12 +60,17 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
             } else if (entry.getKey().startsWith(MetaData.SELECTOR_META_PREFIX)) {
                 metaData.addContentSelector(ContentSelectors.parse(entry.getKey().substring(MetaData.SELECTOR_META_PREFIX.length()), StringUtil.unquote(entry.getValue(), MetaData.ESCAPE_CHARACTER)));
                 continue;
+            } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY + 'l')) {
+                // The user name comes directly after "FILE_DIRECTORYl"
+                String user = entry.getKey().substring(MetaData.FILE_DIRECTORY.length() + 1);
+                metaData.setLaTexFileDirectory(user, getSingleItem(value));
+                continue;
             }
 
             switch (entry.getKey()) {
                 case MetaData.GROUPSTREE:
                 case MetaData.GROUPSTREE_LEGACY:
-                    metaData.setGroups(GroupsParser.importGroups(value, keywordSeparator, fileMonitor));
+                    metaData.setGroups(GroupsParser.importGroups(value, keywordSeparator, fileMonitor, metaData));
                     break;
                 case MetaData.SAVE_ACTIONS:
                     metaData.setSaveActions(Cleanups.parse(value));
diff --git a/src/main/java/org/jabref/model/database/BibDatabaseContext.java b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
index adabb5805ed..3acdf7b484e 100644
--- a/src/main/java/org/jabref/model/database/BibDatabaseContext.java
+++ b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
@@ -185,7 +185,7 @@ public Optional<Path> getFirstExistingFileDir(FilePreferences preferences) {
      * metadata can specify a general directory and/or a user-specific directory or the preferences can specify one. <p>
      * The settings are prioritized in the following order and the first defined setting is used:
      * <ol>
-     *     <li>metdata</li>
+     *     <li>metadata</li>
      *     <li>user-specific directory</li>
      *     <li>preferences directory</li>
      *     <li>BIB file directory</li>
diff --git a/src/main/java/org/jabref/model/groups/TexGroup.java b/src/main/java/org/jabref/model/groups/TexGroup.java
index 92a47028eae..56c2461f905 100644
--- a/src/main/java/org/jabref/model/groups/TexGroup.java
+++ b/src/main/java/org/jabref/model/groups/TexGroup.java
@@ -1,13 +1,20 @@
 package org.jabref.model.groups;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 
 import org.jabref.model.auxparser.AuxParser;
 import org.jabref.model.auxparser.AuxParserResult;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.metadata.MetaData;
+import org.jabref.model.util.FileHelper;
 import org.jabref.model.util.FileUpdateListener;
 import org.jabref.model.util.FileUpdateMonitor;
 
@@ -22,13 +29,17 @@ public class TexGroup extends AbstractGroup implements FileUpdateListener {
     private Set<String> keysUsedInAux = null;
     private final FileUpdateMonitor fileMonitor;
     private AuxParser auxParser;
+    private final MetaData metaData;
+    private final String user;
 
-    public TexGroup(String name, GroupHierarchyType context, Path filePath, AuxParser auxParser, FileUpdateMonitor fileMonitor) throws IOException {
+    public TexGroup(String name, GroupHierarchyType context, Path filePath, AuxParser auxParser, FileUpdateMonitor fileMonitor, MetaData metaData) throws IOException {
         super(name, context);
-        this.filePath = Objects.requireNonNull(filePath);
+        this.metaData = metaData;
+        user = System.getProperty("user.name") + '-' + InetAddress.getLocalHost().getHostName();
+        this.filePath = expandPath(Objects.requireNonNull(filePath));
         this.auxParser = auxParser;
         this.fileMonitor = fileMonitor;
-        fileMonitor.addListenerForFile(filePath, this);
+        fileMonitor.addListenerForFile(this.filePath, this);
     }
 
     @Override
@@ -49,7 +60,7 @@ public boolean isDynamic() {
     @Override
     public AbstractGroup deepCopy() {
         try {
-            return new TexGroup(name.getValue(), context, filePath, auxParser, fileMonitor);
+            return new TexGroup(name.getValue(), context, filePath, auxParser, fileMonitor, metaData);
         } catch (IOException ex) {
             // This should never happen because we were able to monitor the file just fine until now
             LOGGER.error("Problem creating copy of group", ex);
@@ -62,7 +73,7 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if ((o == null) || (getClass() != o.getClass())) {
             return false;
         }
         if (!super.equals(o)) {
@@ -75,7 +86,7 @@ public boolean equals(Object o) {
     @Override
     public String toString() {
         return "TexGroup{" +
-                "filePath=" + filePath +
+               "filePath=" + filePath +
                 ", keysUsedInAux=" + keysUsedInAux +
                 ", auxParser=" + auxParser +
                 ", fileMonitor=" + fileMonitor +
@@ -88,7 +99,7 @@ public int hashCode() {
     }
 
     public Path getFilePath() {
-        return filePath;
+        return relativize(filePath);
     }
 
     @Override
@@ -96,4 +107,37 @@ public void fileUpdated() {
         // Reset previous parse result
         keysUsedInAux = null;
     }
+
+    private Path relativize(Path path) {
+        List<Path> fileDirectories = getFileDirectoriesAsPaths();
+        if (!path.isAbsolute()) {
+            return path;
+        }
+
+        for (Path directory : fileDirectories) {
+            if (path.startsWith(directory)) {
+                return directory.relativize(path);
+            }
+        }
+        return path;
+    }
+
+    private Path expandPath(Path path) {
+        List<Path> fileDirectories = getFileDirectoriesAsPaths();
+        Optional<Path> Fpath = FileHelper.expandFilenameAsPath(path.toString(), fileDirectories);
+        if (Fpath.isPresent()) {
+            return Fpath.get();
+        } else {
+            return path;
+        }
+    }
+
+    private List<Path> getFileDirectoriesAsPaths() {
+        List<Path> fileDirs = new ArrayList<>();
+
+        metaData.getLaTexFileDirectory(user)
+                .ifPresent(LaTexFileDirectory -> fileDirs.add(Paths.get(LaTexFileDirectory).toAbsolutePath().normalize()));
+
+        return fileDirs;
+    }
 }
diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
index 94b105eadac..c2438d92ee3 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -42,6 +42,7 @@ public class MetaData {
     private final EventBus eventBus = new EventBus();
     private final Map<String, String> citeKeyPatterns = new HashMap<>(); // <BibType, Pattern>
     private final Map<String, String> userFileDirectory = new HashMap<>(); // <User, FilePath>
+    private final Map<String, String> LaTexFileDirectory = new HashMap<>(); // <User, FilePath>
     private GroupTreeNode groupsRoot;
     private Charset encoding;
     private SaveOrderConfig saveOrderConfig;
@@ -209,6 +210,20 @@ public void clearUserFileDirectory(String user) {
         postChange();
     }
 
+    public Optional<String> getLaTexFileDirectory(String user) {
+        return Optional.ofNullable(LaTexFileDirectory.get(user));
+    }
+
+    public void setLaTexFileDirectory(String user, String path) {
+        LaTexFileDirectory.put(Objects.requireNonNull(user), Objects.requireNonNull(path));
+        postChange();
+    }
+
+    public void clearLaTexFileDirectory(String user) {
+        LaTexFileDirectory.remove(user);
+        postChange();
+    }
+
     public void markAsNotProtected() {
         isProtected = false;
         postChange();
@@ -285,6 +300,10 @@ public Map<String, String> getUserFileDirectories() {
         return Collections.unmodifiableMap(userFileDirectory);
     }
 
+    public Map<String, String> getLaTexFileDirectories() {
+        return Collections.unmodifiableMap(LaTexFileDirectory);
+    }
+
     public Map<String, List<String>> getUnknownMetaData() {
         return Collections.unmodifiableMap(unkownMetaData);
     }
@@ -310,6 +329,7 @@ public boolean equals(Object o) {
                 && Objects.equals(saveOrderConfig, metaData.saveOrderConfig)
                 && Objects.equals(citeKeyPatterns, metaData.citeKeyPatterns)
                 && Objects.equals(userFileDirectory, metaData.userFileDirectory)
+                && Objects.equals(LaTexFileDirectory, metaData.LaTexFileDirectory)
                 && Objects.equals(defaultCiteKeyPattern, metaData.defaultCiteKeyPattern)
                 && Objects.equals(saveActions, metaData.saveActions) && (mode == metaData.mode)
                 && Objects.equals(defaultFileDirectory, metaData.defaultFileDirectory)
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 6f889dd0133..f6b7bc2978c 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1154,6 +1154,7 @@ Ensure\ unique\ keys\ using\ letters\ (b,\ c,\ ...)=Ensure unique keys using let
 
 General\ file\ directory=General file directory
 User-specific\ file\ directory=User-specific file directory
+LaTex\ file\ directory=LaTex file directory
 Search\ failed\:\ illegal\ search\ expression=Search failed: illegal search expression
 Show\ ArXiv\ column=Show ArXiv column
 
diff --git a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
index a7f2ef36a4c..2ab6ca22861 100644
--- a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
@@ -485,12 +485,13 @@ void writeProtectedFlag() throws Exception {
     void writeFileDirectories() throws Exception {
         metaData.setDefaultFileDirectory("\\Literature\\");
         metaData.setUserFileDirectory("defaultOwner-user", "D:\\Documents");
+        metaData.setLaTexFileDirectory("defaultOwner-user", "D:\\Documents");
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(OS.NEWLINE + "@Comment{jabref-meta: fileDirectory:\\\\Literature\\\\;}" + OS.NEWLINE +
                 OS.NEWLINE + "@Comment{jabref-meta: fileDirectory-defaultOwner-user:D:\\\\Documents;}"
-                + OS.NEWLINE, stringWriter.toString());
+                     + OS.NEWLINE + OS.NEWLINE + "@Comment{jabref-meta: fileDirectoryldefaultOwner-user:D:\\\\Documents;}" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java b/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
index b1560a3aa65..b8625babeb4 100644
--- a/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
+++ b/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
@@ -22,6 +22,7 @@
 import org.jabref.model.groups.SearchGroup;
 import org.jabref.model.groups.TexGroup;
 import org.jabref.model.groups.WordKeywordGroup;
+import org.jabref.model.metadata.MetaData;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -115,7 +116,7 @@ public void serializeSingleAutomaticPersonGroup() {
 
     @Test
     public void serializeSingleTexGroup() throws Exception {
-        TexGroup group = new TexGroup("myTexGroup", GroupHierarchyType.INDEPENDENT, Paths.get("path", "To", "File"), new DefaultAuxParser(new BibDatabase()), new DummyFileUpdateMonitor());
+        TexGroup group = new TexGroup("myTexGroup", GroupHierarchyType.INDEPENDENT, Paths.get("path", "To", "File"), new DefaultAuxParser(new BibDatabase()), new DummyFileUpdateMonitor(), new MetaData());
         List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
         assertEquals(Collections.singletonList("0 TexGroup:myTexGroup;0;path/To/File;1;;;;"), serialization);
     }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
index 116cfd198aa..9069fb93e04 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
@@ -1474,10 +1474,12 @@ void parseDoesNotRecognizeDatabaseIDasUserComment() throws Exception {
     void integrationTestFileDirectories() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("@comment{jabref-meta: fileDirectory:\\\\Literature\\\\;}"
-                        + "@comment{jabref-meta: fileDirectory-defaultOwner-user:D:\\\\Documents;}"));
+                        + "@comment{jabref-meta: fileDirectory-defaultOwner-user:D:\\\\Documents;}"
+                        + "@Comment{jabref-meta: fileDirectoryldefaultOwner-user:D:\\\\Documents;}"));
 
         assertEquals("\\Literature\\", result.getMetaData().getDefaultFileDirectory().get());
         assertEquals("D:\\Documents", result.getMetaData().getUserFileDirectory("defaultOwner-user").get());
+        assertEquals("D:\\Documents", result.getMetaData().getLaTexFileDirectory("defaultOwner-user").get());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java b/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
index 765f93ddcfe..080b2594e69 100644
--- a/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
@@ -17,6 +17,7 @@
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.groups.TexGroup;
+import org.jabref.model.metadata.MetaData;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
 
@@ -28,17 +29,19 @@
 
 public class GroupsParserTest {
     private FileUpdateMonitor fileMonitor;
+    private MetaData metaData;
 
     @BeforeEach
     public void setUp() throws Exception {
         fileMonitor = new DummyFileUpdateMonitor();
+        metaData = new MetaData();
     }
 
     @Test
     // For https://github.com/JabRef/jabref/issues/1681
     public void fromStringParsesExplicitGroupWithEscapedCharacterInName() throws Exception {
         ExplicitGroup expected = new ExplicitGroup("B{\\\"{o}}hmer", GroupHierarchyType.INDEPENDENT, ',');
-        AbstractGroup parsed = GroupsParser.fromString("ExplicitGroup:B{\\\\\"{o}}hmer;0;", ',', fileMonitor);
+        AbstractGroup parsed = GroupsParser.fromString("ExplicitGroup:B{\\\\\"{o}}hmer;0;", ',', fileMonitor, metaData);
 
         assertEquals(expected, parsed);
     }
@@ -46,20 +49,20 @@ public void fromStringParsesExplicitGroupWithEscapedCharacterInName() throws Exc
     @Test
     public void keywordDelimiterThatNeedsToBeEscaped() throws Exception {
         AutomaticGroup expected = new AutomaticKeywordGroup("group1", GroupHierarchyType.INDEPENDENT, "keywords", ';', '>');
-        AbstractGroup parsed = GroupsParser.fromString("AutomaticKeywordGroup:group1;0;keywords;\\;;>;1;;;;;", ';', fileMonitor);
+        AbstractGroup parsed = GroupsParser.fromString("AutomaticKeywordGroup:group1;0;keywords;\\;;>;1;;;;;", ';', fileMonitor, metaData);
         assertEquals(expected, parsed);
     }
 
     @Test
     public void hierarchicalDelimiterThatNeedsToBeEscaped() throws Exception {
         AutomaticGroup expected = new AutomaticKeywordGroup("group1", GroupHierarchyType.INDEPENDENT, "keywords", ',', ';');
-        AbstractGroup parsed = GroupsParser.fromString("AutomaticKeywordGroup:group1;0;keywords;,;\\;;1;;;;;", ';', fileMonitor);
+        AbstractGroup parsed = GroupsParser.fromString("AutomaticKeywordGroup:group1;0;keywords;,;\\;;1;;;;;", ';', fileMonitor, metaData);
         assertEquals(expected, parsed);
     }
 
     @Test
     public void fromStringThrowsParseExceptionForNotEscapedGroupName() throws Exception {
-        assertThrows(ParseException.class, () -> GroupsParser.fromString("ExplicitGroup:slit\\\\;0\\;mertsch_slit2_2007\\;;", ',', fileMonitor));
+        assertThrows(ParseException.class, () -> GroupsParser.fromString("ExplicitGroup:slit\\\\;0\\;mertsch_slit2_2007\\;;", ',', fileMonitor, metaData));
     }
 
     @Test
@@ -85,7 +88,7 @@ public void testImportSubGroups() throws Exception {
         AbstractGroup thirdSubGrpLvl1 = new ExplicitGroup("3", GroupHierarchyType.INDEPENDENT, ',');
         rootNode.addSubgroup(thirdSubGrpLvl1);
 
-        GroupTreeNode parsedNode = GroupsParser.importGroups(orderedData, ',', fileMonitor);
+        GroupTreeNode parsedNode = GroupsParser.importGroups(orderedData, ',', fileMonitor, metaData);
         assertEquals(rootNode.getChildren(), parsedNode.getChildren());
     }
 
@@ -96,7 +99,7 @@ public void fromStringParsesExplicitGroupWithIconAndDescription() throws Excepti
         expected.setExpanded(true);
         expected.setColor(Color.ALICEBLUE);
         expected.setDescription("test description");
-        AbstractGroup parsed = GroupsParser.fromString("StaticGroup:myExplicitGroup;0;1;0xf0f8ffff;test icon;test description;", ',', fileMonitor);
+        AbstractGroup parsed = GroupsParser.fromString("StaticGroup:myExplicitGroup;0;1;0xf0f8ffff;test icon;test description;", ',', fileMonitor, metaData);
 
         assertEquals(expected, parsed);
     }
@@ -104,26 +107,26 @@ public void fromStringParsesExplicitGroupWithIconAndDescription() throws Excepti
     @Test
     public void fromStringParsesAutomaticKeywordGroup() throws Exception {
         AutomaticGroup expected = new AutomaticKeywordGroup("myAutomaticGroup", GroupHierarchyType.INDEPENDENT, "keywords", ',', '>');
-        AbstractGroup parsed = GroupsParser.fromString("AutomaticKeywordGroup:myAutomaticGroup;0;keywords;,;>;1;;;;", ',', fileMonitor);
+        AbstractGroup parsed = GroupsParser.fromString("AutomaticKeywordGroup:myAutomaticGroup;0;keywords;,;>;1;;;;", ',', fileMonitor, metaData);
         assertEquals(expected, parsed);
     }
 
     @Test
     public void fromStringParsesAutomaticPersonGroup() throws Exception {
         AutomaticPersonsGroup expected = new AutomaticPersonsGroup("myAutomaticGroup", GroupHierarchyType.INDEPENDENT, "authors");
-        AbstractGroup parsed = GroupsParser.fromString("AutomaticPersonsGroup:myAutomaticGroup;0;authors;1;;;;", ',', fileMonitor);
+        AbstractGroup parsed = GroupsParser.fromString("AutomaticPersonsGroup:myAutomaticGroup;0;authors;1;;;;", ',', fileMonitor, metaData);
         assertEquals(expected, parsed);
     }
 
     @Test
     public void fromStringParsesTexGroup() throws Exception {
-        TexGroup expected = new TexGroup("myTexGroup", GroupHierarchyType.INDEPENDENT, Paths.get("path", "To", "File"), new DefaultAuxParser(new BibDatabase()), fileMonitor);
-        AbstractGroup parsed = GroupsParser.fromString("TexGroup:myTexGroup;0;path/To/File;1;;;;", ',', fileMonitor);
+        TexGroup expected = new TexGroup("myTexGroup", GroupHierarchyType.INDEPENDENT, Paths.get("path", "To", "File"), new DefaultAuxParser(new BibDatabase()), fileMonitor, metaData);
+        AbstractGroup parsed = GroupsParser.fromString("TexGroup:myTexGroup;0;path/To/File;1;;;;", ',', fileMonitor, metaData);
         assertEquals(expected, parsed);
     }
 
     @Test
     public void fromStringUnknownGroupThrowsException() throws Exception {
-        assertThrows(ParseException.class, () -> GroupsParser.fromString("0 UnknownGroup:myUnknownGroup;0;;1;;;;", ',', fileMonitor));
+        assertThrows(ParseException.class, () -> GroupsParser.fromString("0 UnknownGroup:myUnknownGroup;0;;1;;;;", ',', fileMonitor, metaData));
     }
 }
diff --git a/src/test/java/org/jabref/model/groups/TexGroupTest.java b/src/test/java/org/jabref/model/groups/TexGroupTest.java
index 3d869bee22f..36f5b1b10e5 100644
--- a/src/test/java/org/jabref/model/groups/TexGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/TexGroupTest.java
@@ -1,13 +1,16 @@
 package org.jabref.model.groups;
 
+import java.net.InetAddress;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import org.jabref.logic.auxparser.DefaultAuxParser;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.metadata.MetaData;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -15,10 +18,17 @@
 
 public class TexGroupTest {
 
+    private MetaData metaData;
+
+    @BeforeEach
+    public void setUp() throws Exception {
+        metaData = new MetaData();
+    }
+
     @Test
     public void containsReturnsTrueForEntryInAux() throws Exception {
         Path auxFile = Paths.get(TexGroupTest.class.getResource("paper.aux").toURI());
-        TexGroup group = new TexGroup("paper", GroupHierarchyType.INDEPENDENT, auxFile, new DefaultAuxParser(new BibDatabase()), new DummyFileUpdateMonitor());
+        TexGroup group = new TexGroup("paper", GroupHierarchyType.INDEPENDENT, auxFile, new DefaultAuxParser(new BibDatabase()), new DummyFileUpdateMonitor(), metaData);
         BibEntry inAux = new BibEntry();
         inAux.setCiteKey("Darwin1888");
 
@@ -28,10 +38,20 @@ public void containsReturnsTrueForEntryInAux() throws Exception {
     @Test
     public void containsReturnsTrueForEntryNotInAux() throws Exception {
         Path auxFile = Paths.get(TexGroupTest.class.getResource("paper.aux").toURI());
-        TexGroup group = new TexGroup("paper", GroupHierarchyType.INDEPENDENT, auxFile, new DefaultAuxParser(new BibDatabase()), new DummyFileUpdateMonitor());
+        TexGroup group = new TexGroup("paper", GroupHierarchyType.INDEPENDENT, auxFile, new DefaultAuxParser(new BibDatabase()), new DummyFileUpdateMonitor(), metaData);
         BibEntry notInAux = new BibEntry();
         notInAux.setCiteKey("NotInAux2017");
 
         assertFalse(group.contains(notInAux));
     }
+
+    @Test
+    public void ReturnsTrueIfPathRelative() throws Exception {
+        Path auxFile = Paths.get(TexGroupTest.class.getResource("paper.aux").toURI());
+        String user = System.getProperty("user.name") + '-' + InetAddress.getLocalHost().getHostName();
+        metaData.setLaTexFileDirectory(user, auxFile.getParent().toString());
+        TexGroup group = new TexGroup("paper", GroupHierarchyType.INDEPENDENT, auxFile, new DefaultAuxParser(new BibDatabase()), new DummyFileUpdateMonitor(), metaData);
+
+        assertTrue("paper.aux".matches(group.getFilePath().toString()));
+    }
 }

From 3bd0a1f1bdffe82b9017b3eadc47e34bc09282ce Mon Sep 17 00:00:00 2001
From: samiyac <samiya17094@iiitd.ac.in>
Date: Thu, 21 Mar 2019 01:56:26 +0530
Subject: [PATCH 2/8] relativize code shifted to FileHelper

---
 .../LibraryPropertiesDialog.fxml              |  2 +-
 .../LibraryPropertiesDialogView.java          |  4 ++--
 .../LibraryPropertiesDialogViewModel.java     | 12 +++++------
 .../logic/exporter/MetaDataSerializer.java    |  4 ++--
 .../org/jabref/model/groups/TexGroup.java     | 21 ++++++-------------
 .../org/jabref/model/metadata/MetaData.java   | 12 +++++------
 .../org/jabref/model/util/FileHelper.java     | 13 ++++++++++++
 7 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
index 9352cba7ac4..2cb00861431 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
@@ -42,7 +42,7 @@
                         <TextField fx:id="userSpecificFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="3" />
                         <Button fx:id="browseUserSpefiicFileDir" mnemonicParsing="false" onAction="#browseUserSpecificFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="3" />
                         <Label text="%LaTex file directory" GridPane.rowIndex="4" />
-                        <TextField fx:id="LaTexFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                        <TextField fx:id="laTexFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="4" />
                         <Button fx:id="browseLatexFileDir" mnemonicParsing="false" onAction="#browseLaTexFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="4" />
                         <Label alignment="TOP_LEFT" styleClass="sectionHeader" text="%Override default file directories" GridPane.columnSpan="3" GridPane.rowIndex="1" />
                         <Label alignment="TOP_LEFT" styleClass="sectionHeader" text="%Library protection" GridPane.columnSpan="3" GridPane.rowIndex="5" />
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
index cbb666fe069..2efdb7dfcfd 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
@@ -36,7 +36,7 @@ public class LibraryPropertiesDialogView extends BaseDialog<Void> {
     @FXML private Button browseGeneralFileDir;
     @FXML private TextField userSpecificFileDirectory;
     @FXML private Button browseUserSpefiicFileDir;
-    @FXML private TextField LaTexFileDirectory;
+    @FXML private TextField laTexFileDirectory;
     @FXML private Button browseLatexFileDir;
     @FXML private CheckBox protect;
     @Inject private PreferencesService preferencesService;
@@ -72,7 +72,7 @@ private void initialize() {
 
         generalFileDirectory.textProperty().bindBidirectional(viewModel.generalFileDirectoryPropertyProperty());
         userSpecificFileDirectory.textProperty().bindBidirectional(viewModel.userSpecificFileDirectoryProperty());
-        LaTexFileDirectory.textProperty().bindBidirectional(viewModel.LaTexFileDirectoryProperty());
+        laTexFileDirectory.textProperty().bindBidirectional(viewModel.LaTexFileDirectoryProperty());
 
         encoding.itemsProperty().bind(viewModel.encodingsProperty());
         encoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
index 1648445c37f..c85791ae041 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
@@ -25,7 +25,7 @@ public class LibraryPropertiesDialogViewModel {
 
     private final StringProperty generalFileDirectoryProperty = new SimpleStringProperty("");
     private final StringProperty userSpecificFileDirectoryProperty = new SimpleStringProperty("");
-    private final StringProperty LaTexFileDirectoryProperty = new SimpleStringProperty("");
+    private final StringProperty laTexFileDirectoryProperty = new SimpleStringProperty("");
     private final ListProperty<Charset> encodingsProperty = new SimpleListProperty<>(FXCollections.observableArrayList(Encodings.getCharsets()));
     private final ObjectProperty<Charset> selectedEncodingPropety = new SimpleObjectProperty<>(Encodings.getCharsets().get(0));
     private final BooleanProperty libraryProtectedProperty = new SimpleBooleanProperty();
@@ -62,11 +62,11 @@ public LibraryPropertiesDialogViewModel(BasePanel panel, DialogService dialogSer
         fileDI.ifPresent(userSpecificFileDirectoryProperty::setValue);
 
         Optional<String> fileDL = metaData.getLaTexFileDirectory(preferencesService.getUser());
-        fileDL.ifPresent(LaTexFileDirectoryProperty::setValue);
+        fileDL.ifPresent(laTexFileDirectoryProperty::setValue);
 
         oldUserSpecificFileDir = generalFileDirectoryProperty.getValue();
         oldGeneralFileDir = userSpecificFileDirectoryProperty.getValue();
-        oldLaTexFileDir = LaTexFileDirectoryProperty.getValue();
+        oldLaTexFileDir = laTexFileDirectoryProperty.getValue();
 
         libraryProtectedProperty.setValue(metaData.isProtected());
         oldLibraryProtected = libraryProtectedProperty.getValue();
@@ -81,7 +81,7 @@ public StringProperty userSpecificFileDirectoryProperty() {
     }
 
     public StringProperty LaTexFileDirectoryProperty() {
-        return this.LaTexFileDirectoryProperty;
+        return this.laTexFileDirectoryProperty;
     }
 
     public ListProperty<Charset> encodingsProperty() {
@@ -101,7 +101,7 @@ public void browseUserDir() {
     }
 
     public void browseLaTexDir() {
-        dialogService.showDirectorySelectionDialog(directoryDialogConfiguration).ifPresent(dir -> LaTexFileDirectoryProperty.setValue(dir.toAbsolutePath().toString()));
+        dialogService.showDirectorySelectionDialog(directoryDialogConfiguration).ifPresent(dir -> laTexFileDirectoryProperty.setValue(dir.toAbsolutePath().toString()));
     }
 
     public BooleanProperty libraryProtectedProperty() {
@@ -117,7 +117,7 @@ public boolean userFileDirChanged() {
     }
 
     public boolean LaTexFileDirChanged() {
-        return !oldLaTexFileDir.equals(LaTexFileDirectoryProperty.getValue());
+        return !oldLaTexFileDir.equals(laTexFileDirectoryProperty.getValue());
     }
 
     public boolean protectedValueChanged() {
diff --git a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
index c5a70e13c6a..9ff5577aa92 100644
--- a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
+++ b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
@@ -56,7 +56,7 @@ public static Map<String, String> getSerializedStringMap(MetaData metaData,
         // Write groups if present.
         // Skip this if only the root node exists (which is always the AllEntriesGroup).
         metaData.getGroups().filter(root -> root.getNumberOfChildren() > 0).ifPresent(
-                root -> serializedMetaData.put(MetaData.GROUPSTREE, serializeGroups(root, metaData)));
+                root -> serializedMetaData.put(MetaData.GROUPSTREE, serializeGroups(root)));
 
         // finally add all unknown meta data items to the serialization map
         Map<String, List<String>> unknownMetaData = metaData.getUnknownMetaData();
@@ -115,7 +115,7 @@ private static Map<String, List<String>> serializeCiteKeyPattern(MetaData metaDa
         return stringyPattern;
     }
 
-    private static String serializeGroups(GroupTreeNode root, MetaData metaData) {
+    private static String serializeGroups(GroupTreeNode root) {
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append(OS.NEWLINE);
 
diff --git a/src/main/java/org/jabref/model/groups/TexGroup.java b/src/main/java/org/jabref/model/groups/TexGroup.java
index 56c2461f905..a19f92da19c 100644
--- a/src/main/java/org/jabref/model/groups/TexGroup.java
+++ b/src/main/java/org/jabref/model/groups/TexGroup.java
@@ -30,7 +30,7 @@ public class TexGroup extends AbstractGroup implements FileUpdateListener {
     private final FileUpdateMonitor fileMonitor;
     private AuxParser auxParser;
     private final MetaData metaData;
-    private final String user;
+    private String user;
 
     public TexGroup(String name, GroupHierarchyType context, Path filePath, AuxParser auxParser, FileUpdateMonitor fileMonitor, MetaData metaData) throws IOException {
         super(name, context);
@@ -110,23 +110,14 @@ public void fileUpdated() {
 
     private Path relativize(Path path) {
         List<Path> fileDirectories = getFileDirectoriesAsPaths();
-        if (!path.isAbsolute()) {
-            return path;
-        }
-
-        for (Path directory : fileDirectories) {
-            if (path.startsWith(directory)) {
-                return directory.relativize(path);
-            }
-        }
-        return path;
+        return FileHelper.relativize(path, fileDirectories);
     }
 
     private Path expandPath(Path path) {
         List<Path> fileDirectories = getFileDirectoriesAsPaths();
-        Optional<Path> Fpath = FileHelper.expandFilenameAsPath(path.toString(), fileDirectories);
-        if (Fpath.isPresent()) {
-            return Fpath.get();
+        Optional<Path> fpath = FileHelper.expandFilenameAsPath(path.toString(), fileDirectories);
+        if (fpath.isPresent()) {
+            return fpath.get();
         } else {
             return path;
         }
@@ -136,7 +127,7 @@ private List<Path> getFileDirectoriesAsPaths() {
         List<Path> fileDirs = new ArrayList<>();
 
         metaData.getLaTexFileDirectory(user)
-                .ifPresent(LaTexFileDirectory -> fileDirs.add(Paths.get(LaTexFileDirectory).toAbsolutePath().normalize()));
+                .ifPresent(laTexFileDirectory -> fileDirs.add(Paths.get(laTexFileDirectory).toAbsolutePath().normalize()));
 
         return fileDirs;
     }
diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
index c2438d92ee3..5a2dfecfcc6 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -42,7 +42,7 @@ public class MetaData {
     private final EventBus eventBus = new EventBus();
     private final Map<String, String> citeKeyPatterns = new HashMap<>(); // <BibType, Pattern>
     private final Map<String, String> userFileDirectory = new HashMap<>(); // <User, FilePath>
-    private final Map<String, String> LaTexFileDirectory = new HashMap<>(); // <User, FilePath>
+    private final Map<String, String> laTexFileDirectory = new HashMap<>(); // <User, FilePath>
     private GroupTreeNode groupsRoot;
     private Charset encoding;
     private SaveOrderConfig saveOrderConfig;
@@ -211,16 +211,16 @@ public void clearUserFileDirectory(String user) {
     }
 
     public Optional<String> getLaTexFileDirectory(String user) {
-        return Optional.ofNullable(LaTexFileDirectory.get(user));
+        return Optional.ofNullable(laTexFileDirectory.get(user));
     }
 
     public void setLaTexFileDirectory(String user, String path) {
-        LaTexFileDirectory.put(Objects.requireNonNull(user), Objects.requireNonNull(path));
+        laTexFileDirectory.put(Objects.requireNonNull(user), Objects.requireNonNull(path));
         postChange();
     }
 
     public void clearLaTexFileDirectory(String user) {
-        LaTexFileDirectory.remove(user);
+        laTexFileDirectory.remove(user);
         postChange();
     }
 
@@ -301,7 +301,7 @@ public Map<String, String> getUserFileDirectories() {
     }
 
     public Map<String, String> getLaTexFileDirectories() {
-        return Collections.unmodifiableMap(LaTexFileDirectory);
+        return Collections.unmodifiableMap(laTexFileDirectory);
     }
 
     public Map<String, List<String>> getUnknownMetaData() {
@@ -329,7 +329,7 @@ public boolean equals(Object o) {
                 && Objects.equals(saveOrderConfig, metaData.saveOrderConfig)
                 && Objects.equals(citeKeyPatterns, metaData.citeKeyPatterns)
                 && Objects.equals(userFileDirectory, metaData.userFileDirectory)
-                && Objects.equals(LaTexFileDirectory, metaData.LaTexFileDirectory)
+               && Objects.equals(laTexFileDirectory, metaData.laTexFileDirectory)
                 && Objects.equals(defaultCiteKeyPattern, metaData.defaultCiteKeyPattern)
                 && Objects.equals(saveActions, metaData.saveActions) && (mode == metaData.mode)
                 && Objects.equals(defaultFileDirectory, metaData.defaultFileDirectory)
diff --git a/src/main/java/org/jabref/model/util/FileHelper.java b/src/main/java/org/jabref/model/util/FileHelper.java
index e86e4686429..b2864ff5811 100644
--- a/src/main/java/org/jabref/model/util/FileHelper.java
+++ b/src/main/java/org/jabref/model/util/FileHelper.java
@@ -175,4 +175,17 @@ private static boolean isUrl(String url) {
             return false;
         }
     }
+
+    public static Path relativize(Path path, List<Path> fileDirectories) {
+        if (!path.isAbsolute()) {
+            return path;
+        }
+
+        for (Path directory : fileDirectories) {
+            if (path.startsWith(directory)) {
+                return directory.relativize(path);
+            }
+        }
+        return path;
+    }
 }

From 0e7422c3efc3fc9b5f8db00a7072d09c887f6db0 Mon Sep 17 00:00:00 2001
From: samiyac <samiya17094@iiitd.ac.in>
Date: Thu, 21 Mar 2019 12:11:16 +0530
Subject: [PATCH 3/8] changes

---
 src/main/java/org/jabref/gui/groups/GroupDialog.java | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/jabref/gui/groups/GroupDialog.java b/src/main/java/org/jabref/gui/groups/GroupDialog.java
index d4f863c7a68..ef821d6c506 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialog.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialog.java
@@ -47,6 +47,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.search.SearchQuery;
 import org.jabref.logic.util.StandardFileType;
+import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.Keyword;
@@ -620,16 +621,7 @@ private void openBrowseDialog() {
 
     private Path relativize(Path path) {
         List<Path> fileDirectories = getFileDirectoriesAsPaths();
-        if (!path.isAbsolute()) {
-            return path;
-        }
-
-        for (Path directory : fileDirectories) {
-            if (path.startsWith(directory)) {
-                return directory.relativize(path);
-            }
-        }
-        return path;
+        return FileUtil.relativize(path, fileDirectories);
     }
 
     private List<Path> getFileDirectoriesAsPaths() {

From cf9ba2fca3ef95ba380f3e08a1297350e32c6eea Mon Sep 17 00:00:00 2001
From: samiyac <samiya17094@iiitd.ac.in>
Date: Fri, 22 Mar 2019 01:49:42 +0530
Subject: [PATCH 4/8] Shortens text fields in Required Fields Tab

---
 src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java  | 2 +-
 src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index bbd23b29d97..26f22eb2b6f 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -103,7 +103,7 @@ private void setupPanel(BibEntry entry, boolean compressed, SuggestionProviders
         }
 
         ColumnConstraints columnExpand = new ColumnConstraints();
-        columnExpand.setHgrow(Priority.ALWAYS);
+        columnExpand.setPercentWidth(60);
 
         ColumnConstraints columnDoNotContract = new ColumnConstraints();
         columnDoNotContract.setMinWidth(Region.USE_PREF_SIZE);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml
index 99d6d3f7601..32160f0c544 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml
@@ -6,5 +6,5 @@
 <fx:root xmlns:fx="http://javafx.com/fxml/1" type="HBox" xmlns="http://javafx.com/javafx/8.0.112"
          fx:controller="org.jabref.gui.fieldeditors.BibtexKeyEditor">
     <EditorTextField fx:id="textField"/>
-    <Button fx:id="generateCiteKeyButton" styleClass="icon-button"/>
+    <Button fx:id="generateCiteKeyButton" text="Generate" styleClass="icon-button"/>
 </fx:root>

From 47e9b84a0b73cd321c9fdce24ac32c7bc4bdf20a Mon Sep 17 00:00:00 2001
From: samiyac <samiya17094@iiitd.ac.in>
Date: Fri, 22 Mar 2019 01:54:34 +0530
Subject: [PATCH 5/8] Removing irrelevant changes

---
 src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java  | 2 +-
 src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 26f22eb2b6f..bbd23b29d97 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -103,7 +103,7 @@ private void setupPanel(BibEntry entry, boolean compressed, SuggestionProviders
         }
 
         ColumnConstraints columnExpand = new ColumnConstraints();
-        columnExpand.setPercentWidth(60);
+        columnExpand.setHgrow(Priority.ALWAYS);
 
         ColumnConstraints columnDoNotContract = new ColumnConstraints();
         columnDoNotContract.setMinWidth(Region.USE_PREF_SIZE);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml
index 32160f0c544..99d6d3f7601 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.fxml
@@ -6,5 +6,5 @@
 <fx:root xmlns:fx="http://javafx.com/fxml/1" type="HBox" xmlns="http://javafx.com/javafx/8.0.112"
          fx:controller="org.jabref.gui.fieldeditors.BibtexKeyEditor">
     <EditorTextField fx:id="textField"/>
-    <Button fx:id="generateCiteKeyButton" text="Generate" styleClass="icon-button"/>
+    <Button fx:id="generateCiteKeyButton" styleClass="icon-button"/>
 </fx:root>

From 207784ea55b115f04fb67544ba1dc44953fbdefa Mon Sep 17 00:00:00 2001
From: samiyac <samiya17094@iiitd.ac.in>
Date: Tue, 26 Mar 2019 23:19:16 +0530
Subject: [PATCH 6/8] Implemented requested changes

---
 .../org/jabref/gui/groups/GroupDialog.java    |  2 +-
 .../LibraryPropertiesDialogView.java          |  3 ++-
 .../LibraryPropertiesDialogViewModel.java     |  6 ++++--
 .../logic/exporter/MetaDataSerializer.java    |  2 +-
 .../logic/importer/util/MetaDataParser.java   | 11 ++++++----
 .../org/jabref/model/groups/TexGroup.java     | 21 +++++++++++--------
 .../org/jabref/model/metadata/MetaData.java   | 13 ++++++------
 .../exporter/BibtexDatabaseWriterTest.java    |  4 ++--
 .../importer/fileformat/BibtexParserTest.java |  4 ++--
 .../org/jabref/model/groups/TexGroupTest.java | 12 +++++------
 10 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/src/main/java/org/jabref/gui/groups/GroupDialog.java b/src/main/java/org/jabref/gui/groups/GroupDialog.java
index ef821d6c506..2285db635ac 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialog.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialog.java
@@ -628,7 +628,7 @@ private List<Path> getFileDirectoriesAsPaths() {
         List<Path> fileDirs = new ArrayList<>();
         MetaData metaData = basePanel.getBibDatabaseContext().getMetaData();
         metaData.getLaTexFileDirectory(prefs.getFilePreferences().getUser())
-                .ifPresent(LaTexFileDirectory -> fileDirs.add(Paths.get(LaTexFileDirectory).toAbsolutePath().normalize()));
+                .ifPresent(laTexFileDirectory -> fileDirs.add(laTexFileDirectory));
 
         return fileDirs;
     }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
index 2efdb7dfcfd..3ddb7a2a5d1 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.libraryproperties;
 
 import java.nio.charset.Charset;
+import java.nio.file.Paths;
 import java.util.Optional;
 
 import javax.inject.Inject;
@@ -146,7 +147,7 @@ private void storeSettings() {
         if (text.isEmpty()) {
             metaData.clearLaTexFileDirectory(preferencesService.getUser());
         } else {
-            metaData.setLaTexFileDirectory(preferencesService.getUser(), text);
+            metaData.setLaTexFileDirectory(preferencesService.getUser(), Paths.get(text));
         }
 
         if (viewModel.libraryProtectedProperty().getValue()) {
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
index c85791ae041..0a31043333f 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.libraryproperties;
 
 import java.nio.charset.Charset;
+import java.nio.file.Path;
 import java.util.Optional;
 
 import javafx.beans.property.BooleanProperty;
@@ -61,8 +62,9 @@ public LibraryPropertiesDialogViewModel(BasePanel panel, DialogService dialogSer
         Optional<String> fileDI = metaData.getUserFileDirectory(preferencesService.getUser());
         fileDI.ifPresent(userSpecificFileDirectoryProperty::setValue);
 
-        Optional<String> fileDL = metaData.getLaTexFileDirectory(preferencesService.getUser());
-        fileDL.ifPresent(laTexFileDirectoryProperty::setValue);
+        Optional<Path> fileDL = metaData.getLaTexFileDirectory(preferencesService.getUser());
+        Optional<String> laTexFile = Optional.ofNullable(fileDL.toString());
+        laTexFile.ifPresent(laTexFileDirectoryProperty::setValue);
 
         oldUserSpecificFileDir = generalFileDirectoryProperty.getValue();
         oldGeneralFileDir = userSpecificFileDirectoryProperty.getValue();
diff --git a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
index 9ff5577aa92..b75253685d4 100644
--- a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
+++ b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
@@ -44,7 +44,7 @@ public static Map<String, String> getSerializedStringMap(MetaData metaData,
         metaData.getUserFileDirectories().forEach((user, path) -> stringyMetaData
                 .put(MetaData.FILE_DIRECTORY + '-' + user, Collections.singletonList(path.trim())));
         metaData.getLaTexFileDirectories().forEach((user, path) -> stringyMetaData
-                .put(MetaData.FILE_DIRECTORY + 'l' + user, Collections.singletonList(path.trim())));
+                .put(MetaData.FILE_DIRECTORY + "Latex-" + user, Collections.singletonList(path.toString().trim())));
 
         for (ContentSelector selector: metaData.getContentSelectorList()) {
                 stringyMetaData.put(MetaData.SELECTOR_META_PREFIX + selector.getFieldName(), selector.getValues());
diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
index e85ce89cdc2..1c3a9b211c5 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -3,6 +3,8 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -60,10 +62,11 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
             } else if (entry.getKey().startsWith(MetaData.SELECTOR_META_PREFIX)) {
                 metaData.addContentSelector(ContentSelectors.parse(entry.getKey().substring(MetaData.SELECTOR_META_PREFIX.length()), StringUtil.unquote(entry.getValue(), MetaData.ESCAPE_CHARACTER)));
                 continue;
-            } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY + 'l')) {
-                // The user name comes directly after "FILE_DIRECTORYl"
-                String user = entry.getKey().substring(MetaData.FILE_DIRECTORY.length() + 1);
-                metaData.setLaTexFileDirectory(user, getSingleItem(value));
+            } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY + "Latex-")) {
+                // The user name comes directly after "FILE_DIRECTORYLatex-"
+                String user = entry.getKey().substring(MetaData.FILE_DIRECTORY.length() + 6);
+                Path path = Paths.get(getSingleItem(value)).normalize();
+                metaData.setLaTexFileDirectory(user, path);
                 continue;
             }
 
diff --git a/src/main/java/org/jabref/model/groups/TexGroup.java b/src/main/java/org/jabref/model/groups/TexGroup.java
index a19f92da19c..8bfd7e4b5f8 100644
--- a/src/main/java/org/jabref/model/groups/TexGroup.java
+++ b/src/main/java/org/jabref/model/groups/TexGroup.java
@@ -3,11 +3,9 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 
 import org.jabref.model.auxparser.AuxParser;
@@ -32,6 +30,16 @@ public class TexGroup extends AbstractGroup implements FileUpdateListener {
     private final MetaData metaData;
     private String user;
 
+    public TexGroup(String name, GroupHierarchyType context, Path filePath, AuxParser auxParser, FileUpdateMonitor fileMonitor, MetaData metaData, String user) throws IOException {
+        super(name, context);
+        this.metaData = metaData;
+        this.user = user;
+        this.filePath = expandPath(Objects.requireNonNull(filePath));
+        this.auxParser = auxParser;
+        this.fileMonitor = fileMonitor;
+        fileMonitor.addListenerForFile(this.filePath, this);
+    }
+
     public TexGroup(String name, GroupHierarchyType context, Path filePath, AuxParser auxParser, FileUpdateMonitor fileMonitor, MetaData metaData) throws IOException {
         super(name, context);
         this.metaData = metaData;
@@ -115,19 +123,14 @@ private Path relativize(Path path) {
 
     private Path expandPath(Path path) {
         List<Path> fileDirectories = getFileDirectoriesAsPaths();
-        Optional<Path> fpath = FileHelper.expandFilenameAsPath(path.toString(), fileDirectories);
-        if (fpath.isPresent()) {
-            return fpath.get();
-        } else {
-            return path;
-        }
+        return FileHelper.expandFilenameAsPath(path.toString(), fileDirectories).orElse(path);
     }
 
     private List<Path> getFileDirectoriesAsPaths() {
         List<Path> fileDirs = new ArrayList<>();
 
         metaData.getLaTexFileDirectory(user)
-                .ifPresent(laTexFileDirectory -> fileDirs.add(Paths.get(laTexFileDirectory).toAbsolutePath().normalize()));
+                .ifPresent(laTexFileDirectory -> fileDirs.add(laTexFileDirectory));
 
         return fileDirs;
     }
diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
index 5a2dfecfcc6..7fc52e99842 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -1,6 +1,7 @@
 package org.jabref.model.metadata;
 
 import java.nio.charset.Charset;
+import java.nio.file.Path;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -42,7 +43,7 @@ public class MetaData {
     private final EventBus eventBus = new EventBus();
     private final Map<String, String> citeKeyPatterns = new HashMap<>(); // <BibType, Pattern>
     private final Map<String, String> userFileDirectory = new HashMap<>(); // <User, FilePath>
-    private final Map<String, String> laTexFileDirectory = new HashMap<>(); // <User, FilePath>
+    private final Map<String, Path> laTexFileDirectory = new HashMap<>(); // <User, FilePath>
     private GroupTreeNode groupsRoot;
     private Charset encoding;
     private SaveOrderConfig saveOrderConfig;
@@ -51,8 +52,8 @@ public class MetaData {
     private BibDatabaseMode mode;
     private boolean isProtected;
     private String defaultFileDirectory;
-    private ContentSelectors contentSelectors = new ContentSelectors();
-    private Map<String, List<String>> unkownMetaData = new HashMap<>();
+    private final ContentSelectors contentSelectors = new ContentSelectors();
+    private final Map<String, List<String>> unkownMetaData = new HashMap<>();
     private boolean isEventPropagationEnabled = true;
 
     /**
@@ -210,11 +211,11 @@ public void clearUserFileDirectory(String user) {
         postChange();
     }
 
-    public Optional<String> getLaTexFileDirectory(String user) {
+    public Optional<Path> getLaTexFileDirectory(String user) {
         return Optional.ofNullable(laTexFileDirectory.get(user));
     }
 
-    public void setLaTexFileDirectory(String user, String path) {
+    public void setLaTexFileDirectory(String user, Path path) {
         laTexFileDirectory.put(Objects.requireNonNull(user), Objects.requireNonNull(path));
         postChange();
     }
@@ -300,7 +301,7 @@ public Map<String, String> getUserFileDirectories() {
         return Collections.unmodifiableMap(userFileDirectory);
     }
 
-    public Map<String, String> getLaTexFileDirectories() {
+    public Map<String, Path> getLaTexFileDirectories() {
         return Collections.unmodifiableMap(laTexFileDirectory);
     }
 
diff --git a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
index 2ab6ca22861..c0d3994dbfc 100644
--- a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
@@ -485,13 +485,13 @@ void writeProtectedFlag() throws Exception {
     void writeFileDirectories() throws Exception {
         metaData.setDefaultFileDirectory("\\Literature\\");
         metaData.setUserFileDirectory("defaultOwner-user", "D:\\Documents");
-        metaData.setLaTexFileDirectory("defaultOwner-user", "D:\\Documents");
+        metaData.setLaTexFileDirectory("defaultOwner-user", Paths.get("D:\\Latex"));
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(OS.NEWLINE + "@Comment{jabref-meta: fileDirectory:\\\\Literature\\\\;}" + OS.NEWLINE +
                 OS.NEWLINE + "@Comment{jabref-meta: fileDirectory-defaultOwner-user:D:\\\\Documents;}"
-                     + OS.NEWLINE + OS.NEWLINE + "@Comment{jabref-meta: fileDirectoryldefaultOwner-user:D:\\\\Documents;}" + OS.NEWLINE, stringWriter.toString());
+                     + OS.NEWLINE + OS.NEWLINE + "@Comment{jabref-meta: fileDirectoryLatex-defaultOwner-user:D:\\\\Latex;}" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
index 9069fb93e04..04fca15aff8 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
@@ -1475,11 +1475,11 @@ void integrationTestFileDirectories() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("@comment{jabref-meta: fileDirectory:\\\\Literature\\\\;}"
                         + "@comment{jabref-meta: fileDirectory-defaultOwner-user:D:\\\\Documents;}"
-                        + "@Comment{jabref-meta: fileDirectoryldefaultOwner-user:D:\\\\Documents;}"));
+                         + "@comment{jabref-meta: fileDirectoryLatex-defaultOwner-user:D:\\\\Latex;}"));
 
         assertEquals("\\Literature\\", result.getMetaData().getDefaultFileDirectory().get());
         assertEquals("D:\\Documents", result.getMetaData().getUserFileDirectory("defaultOwner-user").get());
-        assertEquals("D:\\Documents", result.getMetaData().getLaTexFileDirectory("defaultOwner-user").get());
+        assertEquals("D:\\Latex", result.getMetaData().getLaTexFileDirectory("defaultOwner-user").get().toString());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/groups/TexGroupTest.java b/src/test/java/org/jabref/model/groups/TexGroupTest.java
index 36f5b1b10e5..e2408b08308 100644
--- a/src/test/java/org/jabref/model/groups/TexGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/TexGroupTest.java
@@ -1,6 +1,5 @@
 package org.jabref.model.groups;
 
-import java.net.InetAddress;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -13,6 +12,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -46,12 +46,12 @@ public void containsReturnsTrueForEntryNotInAux() throws Exception {
     }
 
     @Test
-    public void ReturnsTrueIfPathRelative() throws Exception {
+    public void getFilePathReturnsRelativePath() throws Exception {
         Path auxFile = Paths.get(TexGroupTest.class.getResource("paper.aux").toURI());
-        String user = System.getProperty("user.name") + '-' + InetAddress.getLocalHost().getHostName();
-        metaData.setLaTexFileDirectory(user, auxFile.getParent().toString());
-        TexGroup group = new TexGroup("paper", GroupHierarchyType.INDEPENDENT, auxFile, new DefaultAuxParser(new BibDatabase()), new DummyFileUpdateMonitor(), metaData);
+        String user = "Darwin";
+        metaData.setLaTexFileDirectory(user, auxFile.getParent());
+        TexGroup group = new TexGroup("paper", GroupHierarchyType.INDEPENDENT, auxFile, new DefaultAuxParser(new BibDatabase()), new DummyFileUpdateMonitor(), metaData, user);
 
-        assertTrue("paper.aux".matches(group.getFilePath().toString()));
+        assertEquals("paper.aux", group.getFilePath().toString());
     }
 }

From dded166d727ce3ad1dea74abcb566ba466886d25 Mon Sep 17 00:00:00 2001
From: samiyac <samiya17094@iiitd.ac.in>
Date: Sat, 30 Mar 2019 00:55:43 +0530
Subject: [PATCH 7/8] Implemented changes

---
 .../libraryproperties/LibraryPropertiesDialogView.java    | 1 -
 .../LibraryPropertiesDialogViewModel.java                 | 2 ++
 src/main/java/org/jabref/model/groups/TexGroup.java       | 8 +-------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
index 3ddb7a2a5d1..58002962d84 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
@@ -38,7 +38,6 @@ public class LibraryPropertiesDialogView extends BaseDialog<Void> {
     @FXML private TextField userSpecificFileDirectory;
     @FXML private Button browseUserSpefiicFileDir;
     @FXML private TextField laTexFileDirectory;
-    @FXML private Button browseLatexFileDir;
     @FXML private CheckBox protect;
     @Inject private PreferencesService preferencesService;
 
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
index 0a31043333f..d4499581c03 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
@@ -62,6 +62,8 @@ public LibraryPropertiesDialogViewModel(BasePanel panel, DialogService dialogSer
         Optional<String> fileDI = metaData.getUserFileDirectory(preferencesService.getUser());
         fileDI.ifPresent(userSpecificFileDirectoryProperty::setValue);
 
+        metaData.getLaTexFileDirectory(preferencesService.getUser()).map(Path::toString).ifPresent(laTexFileDirectoryProperty::setValue);
+        
         Optional<Path> fileDL = metaData.getLaTexFileDirectory(preferencesService.getUser());
         Optional<String> laTexFile = Optional.ofNullable(fileDL.toString());
         laTexFile.ifPresent(laTexFileDirectoryProperty::setValue);
diff --git a/src/main/java/org/jabref/model/groups/TexGroup.java b/src/main/java/org/jabref/model/groups/TexGroup.java
index 8bfd7e4b5f8..ab350c486d5 100644
--- a/src/main/java/org/jabref/model/groups/TexGroup.java
+++ b/src/main/java/org/jabref/model/groups/TexGroup.java
@@ -41,13 +41,7 @@ public TexGroup(String name, GroupHierarchyType context, Path filePath, AuxParse
     }
 
     public TexGroup(String name, GroupHierarchyType context, Path filePath, AuxParser auxParser, FileUpdateMonitor fileMonitor, MetaData metaData) throws IOException {
-        super(name, context);
-        this.metaData = metaData;
-        user = System.getProperty("user.name") + '-' + InetAddress.getLocalHost().getHostName();
-        this.filePath = expandPath(Objects.requireNonNull(filePath));
-        this.auxParser = auxParser;
-        this.fileMonitor = fileMonitor;
-        fileMonitor.addListenerForFile(this.filePath, this);
+        this(name, context, filePath, auxParser, fileMonitor, metaData, System.getProperty("user.name") + '-' + InetAddress.getLocalHost().getHostName());
     }
 
     @Override

From ee116a6e672ed908dca39f13a383b8b10e51e93a Mon Sep 17 00:00:00 2001
From: samiyac <samiya17094@iiitd.ac.in>
Date: Sat, 30 Mar 2019 02:26:30 +0530
Subject: [PATCH 8/8] Delete irrelevant code

---
 .../libraryproperties/LibraryPropertiesDialogViewModel.java   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
index d4499581c03..e7791d7a534 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
@@ -63,10 +63,6 @@ public LibraryPropertiesDialogViewModel(BasePanel panel, DialogService dialogSer
         fileDI.ifPresent(userSpecificFileDirectoryProperty::setValue);
 
         metaData.getLaTexFileDirectory(preferencesService.getUser()).map(Path::toString).ifPresent(laTexFileDirectoryProperty::setValue);
-        
-        Optional<Path> fileDL = metaData.getLaTexFileDirectory(preferencesService.getUser());
-        Optional<String> laTexFile = Optional.ofNullable(fileDL.toString());
-        laTexFile.ifPresent(laTexFileDirectoryProperty::setValue);
 
         oldUserSpecificFileDir = generalFileDirectoryProperty.getValue();
         oldGeneralFileDir = userSpecificFileDirectoryProperty.getValue();